Merge pull request #13 from borkweb/v1

Pass user around correctly
Re-adding logged_in_as var