BBU (Big Bookmarks Update)

See commits below. First part was just syncing my repo though...