Merge pull request #28 from zillow/master

Adding an optional p4env preference to override .bash_profile sourcing
Credits
Merge pull request #29 from zillow/master

Comment spelling fix
Fixing threading issues with settings