Merge pull request #566 from edx/will/devstack-base-box

Set devstack base box to empanada release (RC)
Merge remote-tracking branch 'origin/master' into rc/empanada
Merge remote-tracking branch 'origin' into rc/empanada
Merge pull request #561 from edx/rc/empanada

Rc/empanada
Merge pull request #729 from edx/jarv/focaccia

Jarv/focaccia
Merge branch 'master' into release
Merge pull request #775 from edx/feanil/release-gugelhupf

Feanil/release gugelhupf
Merge tag 'tags/release-gugelhupf'

Gugelhupf Release 2014-02-11