Cleaned up code, sharpened interfaces a bit. Switched to css files.
Merge branch 'master' into gh-pages
rebuild js