clear out middleware/2x check/basemap option
merge in master
update geocoder to use api key
fix search
remove basemap from default project template
merge master
bump
Merge pull request #471 from mapbox/mapboxjs-v2

Mapboxjs v2
Add tilecount + tilesize assertions.
Sketch of copy streams in tm2. Refs #472.
update base
Merge pull request #473 from mapbox/update-base

update base
Use speedometer to revive tiles/sec calc.
Close the tmp db before renaming.
Add slight delay to updatename submission.
Merge branch 'master' of github.com:mapbox/tm2
Merge branch 'master' into tilelive-streams
Use master of tilelive.
Revert "Add slight delay to updatename submission."

This reverts commit 323f1ec9bb4fa59fcd8082e0ca77b4c9448c0f3a.
Use larger delay on ajax handler.