The Scala/Play refactor was a flop - so moving on to merging the good stuff from NoIR
Cleanup on latest working version
Merge pull request #7 from deckerego/NoIR_Merge

Combine changes from NoIR branch