fix undefined function reference
Merge pull request #551 from mapbox/bookmarks

Bookmark loading issues
bookmark loading cleanup and tests
Merge pull request #556 from mapbox/bookmarks

Bookmark loading cleanup and tests
Travis bump.
update default sources to include mbs v5, terrain, satellite. Refs #518.
Update default source test.
Merge branch 'master' into streamingupload