Support proxy environment
Merge remote-tracking branch 'upstream/master'

Conflicts:
	files/boxen-monkeypatches.rb
Merge remote-tracking branch 'upstream/master'

Conflicts:
	files/boxen-monkeypatches.rb
Merge pull request #34 from occ-corp/master

Support proxy environment