Accord with Herbie publish script
Not really sure what this is updating...
Marmalade to MELPA
Major Elisp clean-up
Hide some things
Hide or commit a bunch of things
Hide more things
Merge branch 'master' of ssh://github.com/pavpanchekha/dotfiles

Conflicts:
	.gitignore