Revert merge
First push towards v2
Fixups, custom layers.
Merge pull request #24 from mapbox/v2

V2