finish merge conflict fix
Merge pull request #81 from seanlarge/iss-john-merge-profiles

finish merge conflict fix for Max's profiles table etc.