fixed bookmarks map and took out tools
added test to make sure only bookmarked pices appear on bookmark map
Merge pull request #140 from osulp/feature/FixBookmarks

fixed bookmarks map and took out tools