updates
Merge branch 'gh-pages' of github.com:shawnrice/bundler-docs into gh-pages