prep for gh-pages
.
merge master into gh-pages
bundle
cleanup, add update/reset methods
v0.2.1