Added a Gemfile for the required development and test gems
Cleaned up .gitignore
Added Gemfile to gemspec
Merge branch 'master' into dev