Some cleanups
Merge branch 'master' of github.com:craftsmancoding/repoman

Conflicts:
	views/links.php