cleanup after merge conflict with latest develop branch
Bug #1762 - bundler test.rb should require specific version of shoulda
Bug #1763 - new version of mocha breaks testing
make bundler a bit more packaging friendly.