Sync changes from master branch.

.gitignore

@@ -6,24 +6,30 @@
 .nfs*
 *.save
 .*.swp
+.CFUserTextEncoding
+.DS_Store
 /.ICEauthority
+/.Trash/
 /.Xauthority*
 /.ab*
 /.alpine-smime/
 /.aspell.*
 /.bash_history*
 /.cache/
+/.cups/
 /.dbus/
 /.fltk/
 /.lesshst
 /.lynx.cookies
 /.mozilla/
 /.nanorc
+/.nano_history
 /.pki/
 /.rnd
 /.screen-*/
 /.sqlite_history
 /.thumbnails/
+/.viminfo
 /.vmware/
 /.vnc/
 /.wget-hsts