Update .vimperatorrc
Add .emacs
Add .emacs
WIP
Merge remote-tracking branch 'origin/laptop'

Conflicts:
	.emacs
	.gitignore
	.vimperatorrc
.emacs