WIP git-branch-status
Merge branch 'master' of https://github.com/joeytwiddle/rc_files