New improved profiles
Merge branch 'trunk' of git://github.com/variations-on-video/hydrant-felix into trunk