Links on vendor page fixed.
Merge branch 'screamout_engine' of github.com:joshsoftware/intranet into screamout_engine

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.haml