Some cleanup (to squash)
Add synchronization marks around the creation of pacemaker resources
Merge pull request #2 from vuntz/pacemaker

Some cleanups + sync marks