changed vim color scheme
preserve merge commits when rebasing
zsh fix for bower
space/backspace hotkey for vim
modified Rakefile to support font copying in OSX (Rakefile modifications taken from https://github.com/njonsson/dotfiles)
wider column count in gvim