Cleanup gem dependencies and integrate with RVM gemsets