added conditional requirejs dependency
added Gemfile
Merge branch 'master' of http://github.com/campsafari/generator-nikita