Changed Gemfile to use github gem version and little refactor