tidying
merge
path is wrong in html
making progress on automated JS testing (#273)
BAM #273 (though travis may fail due to not having drivers)