Initial commit after porting to new gemspec