Combines Track/Stop into one view, begiins attempting to modify color scheme
Merge pull request #137 from jamesongamble/master

Combines Track and Stop into one view. Cleans up unnecessary controllers in services.js