init from activator template
awkwardly moving towards a logo server
Merge remote-tracking branch 'ny-scala-logo/master' into merge/foo

Conflicts:
	app/assets/javascripts/index.coffee
	app/views/index.scala.html
	build.sbt