Replaced use of '[[' with '[' in .bash_profile
Setting PATH in .profile did nothing; moved it to .bashrc
Merge branch 'master' into mac