Updated for Piwik 2.2.2
Merge branch 'master' of https://github.com/Jnull/piwik-openshift-quickstart

Conflicts:
	README
Revert "Merge branch 'master' of https://github.com/Jnull/piwik-openshift-quickstart"

This reverts commit dae4bed14530790f55b9efa82e5fbfb0e2e44e94, reversing
changes made to 4d255a6d34ffab2f5f42c11053efc458e500bd43.