fix some bugs
Merge branch 'master' of github.com:ihepburn/cygwin_config

Conflicts:
	.bashrc
	.emacs

* .bashrc: fix the conflicts