Changed jade names to be more descriptive, also got rid of spaces in layout.jade
merge