Merge branch 'master' of https://github.com/bbatsov/prelude

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/bbatsov/prelude
Merge branch 'master' of github.com:JamesYuan/emacs.d
Merge branch 'master' of https://github.com/bbatsov/prelude
c
Merge branch 'master' of https://github.com/bbatsov/prelude
Merge branch 'master' of github.com:JamesYuan/emacs.d