Removed Razor1 and Reference Fix Up to Razor2
Merge pull request #593 from bchavez/master

Razor1 removal and cleanup