Merge pull request #10 from codeforamerica/pages

Merging in changes from pages
Merge branch 'pages' into gh-pages
Merge branch 'pages' into gh-pages
Merge branch 'pages' into gh-pages
Merge branch 'pages' into gh-pages
Merge branch 'pages' into gh-pages
Merge branch 'pages' into gh-pages
Merge branch 'pages' into gh-pages
Merge branch 'gh-pages' into onepage