A few test. Some dead code deletions and update to test util
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster
Merge pull request #294 from mrathjen/mMaster

 	A few test. Some dead code deletions and update to test util