Link fixes
Merge branch 'master' of github.com:CODEthermostat/aim-code2014

Conflicts:
	app/views/people.php
Merge branch 'master' of github.com:CODEthermostat/aim-code2014
Styling output