fixed bug; wrote a test
minor fix
Merge remote-tracking branch 'origin/master'
simple fix; +2 tests
merge with master
No longer use 404.html template file

Instead generate one dynamically
Merge pull request #21 from pbs/LUN-1250

LUN-1250