104 Commits (cb29ad7fa1044f67a9df05c5e4d5d07a1e5460ee)

Author	SHA1	Message	Date
Andy Meneely	00e8b59144	Ugh, Yaml has a <<: merge key. facepalm: true	2014-08-14 17:02:28 -04:00
Andy Meneely	6895e1276b	Handling of multiple extends in a single entry	2014-08-14 16:20:02 -04:00
Andy Meneely	1371bd81bd	Implementing multi-level extends, except for one case	2014-08-14 16:05:12 -04:00
Andy Meneely	8bd814fc1a	Some regression tests on loading layouts	2014-08-14 14:35:46 -04:00