replaced tabs with spaces
Added comments for entries in .vimrc that did not have them
Set ~/tmp as backup directory
"mr up" should delete all branches except master and cloudbees

Thanks to Davor Banović for the help.