sbt 13.6 changelog fix
<ballmer>developers developers developers developers</ballmer>
Merge branch 'develop' into feature/changelog-stuff

Conflicts:
	project/Build.scala
Merge pull request #61 from paypal/feature/changelog-stuff

sbt 13.6 changelog fix