General update before reinstall
Merge branch 'master' of http://github.com/Phyrne/dotfiles