Update icons
Merge branch 'master' of github.com:hull/hullstrap
Fix environment, gem etc..
Merge branch 'develop' of github.com:hull/hullstrap into develop

Conflicts:
	source/.DS_Store