Move content shuffling out of controller per #23.

More work is needed to make this modular / plugin friendly.
Merge branch 'master' of github.com:concerto/concerto