do not reference rubygems or bundler in the bin file
lookup executables, files, test_files using git
include all files
bump version
ignore .bundle
fix conflicts in merge