Don't require the test task
Merge branch 'master' of github.com:tubbo/dots

Conflicts:
	vendor/antigen
Merge with VPS...

Merge branch 'master' of github.com:tubbo/dots

Conflicts:
	Rakefile