Expressive views and media directory instead of assets
Merge branch 'master' of git://github.com/modulargaming/pet