Don't always use the static files handler

See issue #20 for details
Merge pull request #21 from bendk/issue-20

Don't always use the static files handler