prod js
ignore source map
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore
js with simple opts
Merge branch 'master' into gh-pages
.
Merge branch 'master' into gh-pages
.
Merge branch 'master' into gh-pages
try advanced again
advanced js
Merge branch 'master' into gh-pages

Conflicts:
	project.clj
fix
new js
merge fix