Admin changes, more settings, user editing, style update
Should be safe to use with flask 0.10 now
Merged features from upstream master