Move from NTEmacs to Emacs with Cygwin.
Merge branch 'master' of github.com:xoinu/.emacs.d

Conflicts:
	init.el