Added overriding of template to 404 template if $query->is_404
Removed some white space
Fixed conditionals for 404 template
Merge pull request #15 from humanmade/fix-404-templates

Should honour query is_404 property