Updates, woo
Merge branch 'master' of github.com:flexd/dotfiles