Merge branch 'master' of github.com:IvanMalison/dotfiles

dotfiles/emacs.d/.gitignore

@@ -1,42 +1,44 @@
+*.elc
+.cask
+.org-id-locations
+.project-roots
+.python-environments/
+.smex-items
+.sx
+.tern-port
+.tutor
+README.el
+README.html
 ac-comphist.dat
 auto-save-list
-eproject.lst
-*.elc
-.smex-items
-places
 backups
-eshell
-url
 bookmarks
-elpa
-.python-environments/
-tramp
-server
-.project-roots
-custom.el
-smex-items
-ido.last
-session.*
-var
-skewer-cache
-.org-id-locations
-jabber-avatar-cache
-this-machine.el
-recentf
-persp-confs/
-.tern-port
-speed-type/
-custom-before.el
 custom-after.el
-org-gcal/
-request/
-org-caldav-backup.org
+custom-before.el
+custom.el
+elpa
 ensime
+eproject.lst
+eshell
+ido.last
+jabber-avatar-cache
+org-caldav-*
+org-caldav-backup.org
+org-gcal/
+persp-confs/
+places
 project-to-org-filepath
-.sx
-.cask
-uber.el
+recentf
+request/
 semanticdb/
-.tutor
-xkcd
-README.el
+server
+session.*
+skewer-cache
+smex-items
+speed-type/
+this-machine.el
+tramp
+uber.el
+url
+var
+xkcd