bodge it togther so it kinda works
Merge branch 'master' into facebook_fixing
implement fancy welcome profile filling form on first login