Swapped default_options and options so that they're merged correctly
Update ruby 2.0.0 patch version
Version bump to 0.2.5
Regenerate gemspec for version 0.2.5
Merge branch 'master' of https://github.com/controlshift/vertebrae
Regenerate gemspec for version 0.2.5