Merge branch 'release/0.11.2'
Merge branch 'release/0.12.0'
Re-order build file bringing all external deps up front
Merge branch 'master' into buildFileMods
Merge pull request #1128 from twitter/buildFileMods

Pulls all external 3rdparty versions up to the top of the build file
Split the TypedJson and TypedJsonLzo
Merge branch 'develop' into typedJsonSource

Conflicts:
	project/Build.scala