Put prompt into a function so i can do cool stuff later
Merge branch 'master' of github.com:apexskier/dotfiles