add jam deps and add jam/ directory to gitignore and jamignore, also make note in readme
add description because jam blew up
rebuild docs
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore