Former SVP
Update for AWS lightning talk
Shortened
Updated diagrams
Updated slides with diagrams
tweaks
Merged in oscon-mesos-ops-2014/master
Merged in oscon-mesos-ops-2014/lightning