Ignoring unwatned dotfiles
Removing cached version of ignored file
Additions by heroku toolbelt
Merging after pull