fix invalid templates
irc link fix
Merge branch 'openshift-origin-release-1' into getup-openshift-origin-release-1