stop tracking webstorm files
minify js, fix some bugs, touch up design
Merge branch 'master' into gh-pages