active and rotatable states
merging master to gh-pages
committing from travis!