Merge branch 'master' of https://github.com/danielbayley/exa into danielbayley-master

# Conflicts:
#	src/output/icons.rs

src/output/icons.rs

@@ -184,9 +184,9 @@ fn icon(file: &File) -> char {
             "groovy"    => '\u{e775}',
             "iso"       => '\u{e271}',
             "lock"      => '\u{f023}',
-            _           => '\u{f15b}'
+            _           => '\u{f016}'
         }
     } else {
-        '\u{f15b}'
+        '\u{f016}'
     }
 }