Allows for better support of layout file names, adds support for haml