Got everything working again! WOO!
Merge branch 'master' of github.com:invertedtomato/ChERP-TT2

Conflicts:
	InvertedTomato.ChERP.Genesis.UI.Test/Views/Home/Index.cshtml