Merge pull request #107 from greboid/profiles

Move profile wrapper.
Handle core package changes.
Merge pull request #108 from csmith/master

Handle core package changes.
Move Profile wrapper back.

Will instead use a new wrapper when I switch to the new core model.