Merged upstream changes and removed Build.scala duplication.
Merge branch 'master' of github.com:ukwa/interject

Conflicts:
	interject-servlet-filter/pom.xml
	interject-webapp/conf/org/apache/tika/mime/custom-mimetypes.xml
Fixed test classpath to avoid system errors

The intergration test harness spits out many errors unless you fix up
the classpath like this.