Switch to p4merge
Cleanup bash_profile