Add iOS simulator alias
Fix clean/dirty status
git-track tracks remote branches
Merge remote-tracking branch 'holman/master'