[vim] Change theme to base16-default and fix scrolling on macvim
Merge branch 'master' of https://github.com/stayradiated/dotfiles

Conflicts:
	Vim/vimrc