trying to fix travis
trying to fix travis
update better-dom to 1.5.3, update infrastructure
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore