Merge pull request #119 from rryan/master_sync

Major refactor of EngineSync / RateControl / BpmControl for master sync.
Remove unused method.