Adds option to specify layout, fixes formatting bugs which broke indentation in slim and haml