take company from path, update string for each company
Merge branch 'hourofcode' of github.com:code-dot-org/code-dot-org into hourofcode

Conflicts:
	pegasus/helpers/hourofcode_helpers.rb