Fix bug where activation email sent upon registration even when Setting is "No activation"
Merge branch '2.2/develop' of git://github.com/swanback/pyrocms into 2.2/develop
Clarified the activation settings label to say Instant Activation