release 1.1.1
Merge branch 'v1.1.x'

Conflicts:
	project/Default.scala
	src/main/scala/com/foursquare/spindle/codegen/plugin/ThriftCodegenPlugin.scala
Cross-compile against Scala 2.10.2
release 1.2.0
1.3.0-SNAPSHOT