Merge branch 'hotfix/2014-12-02test'
Merging develop branch with master branch.
Update README.md
Merging develop branch with master branch.
Merge branch 'master' of github.com:kentprojects/api

Conflicts:
	scripts/production/README.md
Merging develop branch with master branch.
Ensured the SimpleSAML library is being pulled in.
Merging hotfix 'hotfix/2014-12-17-kent-sso' with develop.