Pasted in Sam's stuff
Merge branch 'master' of https://github.com/samsinai/team_citation