edx/configuration — pull request #1246 by hkim823 (2014-06-26 14:25:47+00:00)
Title: Master ... release

After rc/johnnycake has been merged in, updating master to bring in new Vagrantfiles.