Merge the work from internal repository.
  - nested yaml files are supported
  - unit tests are out of date
  - empty sanitization config bug persists:
    chokes if a config file has no sanitization rules
  - port resolution (in Makefile) is inconsistent with Vagrantfile
  - fixtures added to spec/fixtures, run tests via:
      make start_fixtures
      make sitediff_fixtures
Merge pull request #1 from amirkdv/coursecal-merge

Merge the work from internal repository.