add ability to specify a ruby version
add the gemfile best practices
Prepare for next release
fix merge conflicts