Add base16 colorscheme
Use external diff and merge tool
Set font based on platform
Add bundle exec alias for rails
Show git branch in prompt