put charms where they belong
Merge branch 'master' of https://github.com/larryberland/kimbra_studio