oops
Merge branch 'master' of https://github.com/ianpaul/dotfiles

because i need toand it;s my fork.