Complete update to 0.1.7
Merge branch 'master' of github.com:factore/forge
Updated version
Convert to a more direct Gemfile
Reorganize gemfile
Merge conflict in Gemfile