Merge branch 'development' of github.com:erniebrodeur/dotfu into development

Conflicts:
	lib/dotfu/repos.rb
Merge branch 'development' of github.com:erniebrodeur/dotfu into development

Conflicts:
	lib/dotfu/repos.rb