Added emacs
added gitignore
Updated gitignore
Merge branch 'master' of github.com:paritybit/dotfiles