Unrequire rubygems (best practices at http://guides.rubygems.org/patterns/), small fixes