Minor reformatting
Minor refactoring
Minor reformatting
Using require 'bundler/setup'
Updating Gemfile.lock
Fix #27 - Use configuration if passed

Use configuration if passed, otherwise find the default configuration
from build setting
Conflicts:

	lib/shenzhen/commands/build.rb
Merge branch 'master' of github.com:nomad/shenzhen