cleaning up. upload.sh isn't used. buildstep script is more of an example. making maintainer in Dockerfile more consistent with other projects
moving it back for now in master since the project has evolved to focus on the script more than the container, like newer implementations (slugbuilder, etc)
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into expa

Conflicts:
	Dockerfile
	upload.sh