Bookmarks entry is either array of sub-items, or bookmark hash. Not both.
Merge pull request #61 from lentinj/master

Handle nested bookmarks properly (fixes later issue in #40)