removed color prompt from profile (was preventing login)
Merge branch 'master' of github.com:smacke/dotfiles