Remove boxen reference
Remove plugins
Merge branch 'master' of github.com:ebruning/dotfiles

Conflicts:
	gitconfig