Merge pull request #10 from snakevil/master

Unit-tested for fallback views.