Merge branch 'master' into enumerate
Changed sbt down to 0.12.4
Merge pull request #679 from lossyrob/sbt-publish

Changed sbt down to 0.12.4
Removed alternate build.sbt attributes in subprojects
Merge pull request #681 from lossyrob/geotools-build.sbt

Removed alternate build.sbt attributes in subprojects
Fixing tasks build.
Merge pull request #684 from lossyrob/master

Fixing tasks build.
Updating version to 1.0.0-SNAPSHOT, clean build settings.
Merge pull request #685 from lossyrob/upgrade-snapshot-version

Updating version to 1.0.0-SNAPSHOT, clean build settings.
Fix jetty runner by adding asm dependency.

The dependency "asm" % "asm" % "3.3.1" is missing, which causes jetty
to fail to start under the geotrellis-jetty or dependent projects.
This commit adds the dependency to the jetty project.
Add configuration for demo resource package.

The demo project isn't currently configured to load Jersey
resources from the "demo" package where the services in the
demo subproject live.  This commit just restores the one line
config:

geotrellis.rest-package = "demo"
Merge pull request #688 from joshmarcus/add_demo_config

Add configuration for demo resource package.
Merge pull request #686 from joshmarcus/fix_jetty_deps

Fix jetty runner by adding asm dependency.
Fixed demo subproject. Some other refactors\error handling changes.

- Made StepAggregator report child errors instead of just saying "error".
- Fixed some instances where I left out an 's' for string interpolation
- Refactored colors.scala
Merge pull request #690 from lossyrob/fix-demo-project

Fixed demo subproject. Some other refactors\error handling changes.
Merge branch 'enumerate' into new_enum
Merge branch 'master' into new_enum