refactor names and spaces
add support for better-dom 0.9.6
Merge branch 'master' into gh-pages
update better-dom to 0.9.6