minor update
Merge branch 'master' of https://github.com/Sarcasm/.emacs.d

Conflicts:
	init.el
do not ask for loading sarcasm theme
add multicusor-mode generated file to .gitignore