[Issue #28] Using output argument
Merge branch 'master' of https://github.com/mattt/shenzhen

Conflicts:
	lib/shenzhen/commands/build.rb
Trimming whitespace