Fix .travis.yml
Add grunt to travis install
Merge remote-tracking branch 'upstream/master'
Add subtitle filename to video input mapper
Implement subtitles inputmapper
Fix parse* method names for subtitles inputmapper.
Stubbed subtitles sort of work.
Cleanup and using the parsed subtitles
unhardcode the subtitle filename
Style subtitle lines so there are smaller gaps between lines.
s/TotalTim/TotalTime/
Add names to callbacks in subtitle controller.
Getting the SubtitlesController under test.
Merge pull request #15 from tarmstrong/subtitles

Subtitles