checkpoint
chill 0.3.0
remove a TODO
Update build file
Merge branch 'develop' into chill-upgrade

Conflicts:
	project/Build.scala
Merge pull request #508 from twitter/chill-upgrade

Chill upgrade 0.3.0