added in page spec
added annotate gem.
removed statemachine.
edited routes for pages
Merge branch 'master' into pages
updated travis.yml's test db
Merge pull request #2 from rfarine/pages

Pages