asdf
Set version to 0.7- SNAPSHOT and organization to com.ticketfly
Merge remote-tracking branch 'origin/scala_2.10-sbt13'

Conflicts:
	build.sbt
	project/plugins.sbt
Merge remote-tracking branch 'origin/scala_2.10-sbt13'

Conflicts:
	build.sbt
	project/plugins.sbt
Add new key thriftOutDir