HTML, static asset changes
Merge pull request #18 from penzance/html_update

Html update
Additional tests from feature/tracks_activation compatible with the older code
(These were new tests written of older code, as opposed to the tests written for new code in tracks_activation)
removes tests that fail
typo and comment
Merge pull request #21 from penzance/feature/test_coverage

Additional tests from feature/tracks_activation compatible with the older code