Removed solr home from being in the WEB-INF folder and have setup some
default configuration loading stuff
Merge branch 'master' of https://github.com/KolonelKustard/discodj

Conflicts:
	discodj-web/src/main/java/com/totalchange/discodj/web/server/inject/DiscoDjConfigurationModule.java
	discodj-web/src/test/java/com/totalchange/discodj/web/search/inject/IntegrationTestModule.java