added solarized
enable mouse
Set vim filetype to ruby for Vagrantfile
Some changes
Added some git aliases
Filetype conf
Merge remote-tracking branch 'origin/master'

Conflicts:
	.vimrc