Make local config come last in zshrc
Modify rbenv config
Make Sublime the bundler editor
Allow non-ff merges
Make git info come last in command prompt