Update some obsolete stuff
Make gem build work
Make working gem build