* The last two are the the patch that Aleric wanted pulled from his repo. * Added GregC to CONTRIBUTORS.txt, Aleric was already in there. * There's some controversy, Some people have suggested that this could be stored in dynamic attributes instead of the database..    Melanie was wanting to pull from the avination repo but was asked to wait on committing anything new until the release.    The cherry-pick doesn't answer those questions.