commented out broken stuff in gemspec
Merge branch 'dev'