Changing prompt character back to $, explicitly setting options
Merge branch 'master' of https://github.com/daogilvie/dotfiles