Create chill-java
Merge branch 'develop' into chill-java

Conflicts:
	project/Build.scala
Merge pull request #70 from twitter/chill-java

Create chill-java