merge from office :D
Merge branch 'master' of github.com:WaYdotNET/prelude

Conflicts:
	personal/waydotnet.el