fixed prompt, ignore floo, enable floo
Merge branch 'master' of github.com:bitemyapp/dotfiles