more fixes i think
Merge branch 'master' of https://github.com/jordangedney/pantry
Merge branch 'master' of https://github.com/jordangedney/pantry
edit user page up and working