Do not bail on errors for install_box_software.sh
Merge branch 'master' of github.com:scraperwiki/charms

Conflicts:
	raring/custard/revision
Merge branch 'master' of github.com:scraperwiki/charms
Revision