Ignore vim swapfiles
Show git repo state and divergence in prompt
Add rule for generating symlinks in home
Merge branch 'master' of github.com:sjn/dotfiles