Set solarized light color
Set ruler
Ignore .netrwhist
Merge branch 'master' into mac

Conflicts:
	vim/.vimrc
Add handlebars support
Merge branch 'mac'
Set color back to dark
Merge branch 'master' of github.com:christopheradams/dotfiles