changed variable names, cleaned up to pass tests
added 'defaults' to layout support hashes
 formatted routes file. added config hash for old routes