added verbose to branch listing and swapped p4merge columns
added more aliases for android, python, and heroku log tail
Merge branch 'master' of github.com:eventhough/config
set left to local, right to remote