Merge pull request #1 from bspaans/master

Upgrade to Mesos 0.20
Merge pull request #2 from bspaans/master

High Availability and Service Discovery
Move postgres example
rspec settings
Merge remote-tracking branch 'upstream/master'