Switch to Bundler
Merge branch 'master' of github.com:njvack/optimus-ep
Merge branch 'ENH_bundler' of git://github.com/kastman/optimus-ep into kastman-ENH_bundler

Conflicts:
	lib/version.rb
Merge branch 'kastman-ENH_bundler'