added bundler as gem dep
moved heroku build process to separate bin file
updated gemfile to reflect changes
Merge branch 'master' of github.com:fairwaymarket/reservations
attempting to override the ruby v
requiring bundleExec for sass compilation
Merge branch 'master' of github.com:fairwaymarket/reservations

Conflicts:
	Gemfile
porting heroku configuration changes over from test branch
revised environment setup