moving stuff around in master so testinghtml.py works cough jasmine cough