CLC-61 Need better 404 page
https://jira.media.berkeley.edu/jira/browse/CLC-61
Merge pull request #1150 from shacker/CLC-61

CLC-61 Need better 404 page