Bill merging.
Merge pull request #414 from badgerProd/master

Adding in some stuff that makes it work in chrome, but makes it hard to test if you're not Bill.