updates
Merge branch 'master' of github.com:jtraver/dev

Conflicts:
	env/os_image.scp