Reach feature parity using trapperkeeper
bump TK and Om versions