Include local gitconfig at the end of .gitconfig

Allows for customizing git's commit message template and overriding fetch.prune.
Prevent evil nbsp from being invisible

Not seeing these can be problematic, since you won't know what broke your code on the day that one of them sneaks in.

Here's a few other common characters people use for this: https://github.com/search?utf8=%E2%9C%93&q=nbsp%3A+extension%3A.vimrc&type=Code&ref=searchresults
Updating readme to use thoughtbot/formulae

Brew bundle is deprecated. fixes #309
Removes Brewfile, no longer needed
Ignore tags file, but not directories named tags
Merge remote-tracking branch 'upstream/master'