Merge pull request #1 from stevekinney/master

Steve's first brain dump
fix merge conflict
Fix some typos; flush out CSS and JS a bit