git push aliases
git rebase --continue alias
Ignore rbenv version files
Fix hash rocket regex
remove trailing whitespace on save
Syntastic stuff

Conflicts:
	vimrc
Use vim-ruby plugin