Merge branch 'hotfix/fab-complete'
Merge branch 'develop'
Merge branch 'release/bundler'
Merge branch 'develop'
Merge branch 'release/v6.0.2'
Merge branch 'develop' - gitprompt fix
Merge branch 'release/v0.6.3'
Merge branch 'master' of github.com:vigo/dotfiles-bash
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of github.com:vigo/dotfiles-bash
Merge branch 'release/update'
Merge branch 'develop'
Merge branch 'release/v0.6.6'
nanorc fix
Due to nano config issues, i uninstalled nano from brew:

    `brew uninstall nano`

re-installed from http://www.nano-editor.org/. Fix your .nanorc includes...