Fix startup stuff
Merge branch 'master' of https://github.com/clynamen/dotfiles
New bundle