Changes for branch 2-0-stable

Using only gemspec for dependencies.