Updated controllers
Cleaned up code seperation
Merge branch 'master' of https://github.com/hilts-vaughan/railgun