Merge pull request #89 from joshWyatt/refactorControllers

Remove unneccessary comments and services
Refactor give fastpass hardcode data from controller to factory