add timestamp to bash history
remove extraneous blank lines
changes to gpa alias
When doing a gpa from a directory within a branch that does not exist in one of the other branches
Merge pull request #6 from weaselkeeper/master

Alias and bash_history changes