Friggin' Dropbox...

Removed HTML debris that was breaking stuff
Merge pull request #5 from TheKins/master

Update fork with upstream commits