vimrc tweaks
Squashed re-bases
Merge branch 'ubuntu' of github.com:shawndumas/dotfiles into ubuntu