Not hardcoding bashscript config location #398
Merge branch 'master' into fix/bashscript-location

Conflicts:
	src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala
Merge pull request #401 from sbt/fix/bashscript-location

Not hardcoding bashscript config location #398