Merge pull request #5 from madprime/master

Users seem to work now
Pass username to template