Refactored bookmark_mapper and moved bitly into separate service object; updated specs