Fixes #1
Fixing style weirdness in Firefox
Prepping for release
Merging master