initial aws integration
wip loading s3 buckets
Merge branch 'master' into aws

Conflicts:
	boilerplate.coffee
	boilerplate.js
merger