don't source .bash_cygwin unless /proc/version shows we are actually in cygwin
Merge remote-tracking branch 'origin/master'