updated user edit to update tweet activity and other formats
resolve merge conflict in UsersController edit method
Merge pull request #47 from andredempsey/andre

Andre