some changes
fixed merge
permissions blanket, not fine grain
fixed twitter stuff
Verify switch to auth.
Minute step changed to 2
redirect to character page after creating a tweet
I don't even know what this is.
Bring in latest changes from Tman
Resolve conflict?
Add an alt tag to the image links