Changes to bash_preferences committed via script
Merge branch 'master' of https://github.com/lostphilosopher/bash_preferences
Changes to bash_preferences committed via script