BS: Building stacks with a zookeeper master, a mesos master and a marathon framework
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from bspaans/master

Creating a stack
Merge marathon roles and split out install options
Marathon part of mesos_stack from merged marathon role
Whitespaces
Resolve conflic