Cleaning up interface for models.
Merge branch 'master' of github.com:rissem/friend-sound