Added in spot instances
Version bumped Hadoop
Added ability to configure spot instances with a big to run the job
Updated TODOlist and bumped Hadoop ETL version
Updated TODO
Version bump for tests
Fixed #255
Fixing #254
Bumped SBT to 0.12.3
Bumped Scalding to 0.8.5
Hadoop ETL: bumped Scala version to 2.10.0
Hadoop ETL: bumped scala-maxmind-geoip to 0.0.5 to work with Scala 2.10.0
Bumped Specs2 to 1.14
Removed items which were superceded by 0.8.5
Merge branch 'master' into feature/perf-improvements

Conflicts:
	3-enrich/emr-etl-runner/lib/snowplow-emr-etl-runner.rb
	3-enrich/hadoop-etl/src/main/scala/enrichments/EnrichmentManager.scala
	3-enrich/hadoop-etl/src/main/scala/outputs/CanonicalOutput.scala
	3-enrich/hadoop-etl/src/main/scala/utils/ConversionUtils.scala
	CHANGELOG
Bumped Hadoop ETL version to 0.3.2
Excluded minlog.jar to prevent assembly problems
Small clean up of the dist cache code
Adjusted example bid downwards
Added step to consolidate small files prior to running ETL job (#207)
Using S3DistCp as per example given here:

http://docs.aws.amazon.com/ElasticMapReduce/latest/DeveloperGuide/UsingEMR_s3distcp.html
Updated input_folder for ETL job to reference HDFS