Merge pull request #97 from jamesongamble/master

Adds active property to all users
Reenabled Invitations
Merge pull request #98 from ateich/master

Reenabled Invitations
Fixes extra space between active