Converting to testable, 1.9-style code
Merge branch 'master' of https://github.com/ewinslow/elgg-evan