reverting back to bash
moving back to bash
reverting to pre-zsh changes
change pyflakes to flake8
merge changes from srl295
add 'guard' lines to .bash_profile to detect modification
Merge remote-tracking branch 'upstream/master'
if X11 available, use it