Removed extra sublime pref, changed bash prompt to be more generic greeting
Merge branch 'master' of https://github.com/supertopher/dotfiles