Cleaned up code, deleted controller functions and test compiles properly
Merge branch 'master' of https://github.com/rsingla92/tartarus