added hippie expand, some random stuff
added password prompt for windows magit
Merge branch 'master' of https://github.com/jjttjj/.emacs.d

Conflicts:
	init.el
	sane-defaults.el
C-x g for magit-status