Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Some more CSS/bug fixes.
Resolved merge conflicts.
Merge pull request #17 from bushwack/master

No