Fixes #326
Merge pull request #328 from nu-lts/feature/smart_folder_permissions

Fixes #326
Fixes #329
Cleaning up error pages
Updating error layout to match default layout
Missing haml doctype declaration appears to be the problem. Fixes #316
Testing to see if going back just a yield brings up the text...
Merge branch 'develop' into feature/context_sensitive_upload_partials