Merge pull request #5 from code-dot-org/staging

DTT
Merge pull request #9 from code-dot-org/staging

DTT
Merge pull request #11 from code-dot-org/staging

DTT
Merge pull request #12 from code-dot-org/staging

Deploy to test
Merge branch 'staging' into test
Solr requires Java