don't need our own backported geokit anymore. Can use a release version
Updated to Mapstraction v 2.0.18 (and added googlev3 support)
Applied fix for googlev3 controls not showing from https://github.com/mapstraction/mxn/pull/257
Use google maps api v3 (via mapstraction) and add satelite option to map
Actually make it possible to use maps api v3 in production
Move list of assets to precompile over to application.rb so it is available even when production.rb is overridden
Use maps client id if it is available for maps api use
Update newrelic agent for extra features
Add test for html email for authority comment notification. Include test for multiple paragraphs
Upgrade to ruby-2.0.0-p247
Merge branch 'master' into design/initial

* master:
  Upgrade to ruby-2.0.0-p247
  Add test for html email for authority comment notification. Include test for multiple paragraphs
  Update newrelic agent for extra features
  Use maps client id if it is available for maps api use
  Move list of assets to precompile over to application.rb so it is available even when production.rb is overridden
  Actually make it possible to use maps api v3 in production
  Use google maps api v3 (via mapstraction) and add satelite option to map
  Applied fix for googlev3 controls not showing from https://github.com/mapstraction/mxn/pull/257
  Updated to Mapstraction v 2.0.18 (and added googlev3 support)
  don't need our own backported geokit anymore. Can use a release version

Conflicts:
	config/environments/production.rb
Shuffling layout a bit. Prepping for stats change.
Change style of stats.
Changing this contributors business.