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

Bookmark loading cleanup and tests