updating gems
moving to rbenv
Merge branch 'hotfix-norelease'
adding rb-readline
setting major release version to 1.0.0
adding conflict resolutions
Merge pull request #39 from thebeansgroup/release-1.0.0

Release 1.0.0
moving haml-coderay to gemspec
Merge pull request #40 from thebeansgroup/hotfix-1.0.1

moving haml-coderay to gemspec
bumping version
adding gem lock after version bump
adding changelog
adding two development gems
Merge branch 'master' into develop