fixing some things, breaking others
more changes to get beat api working
Merge pull request #3 from amlsf/drake-update

Drake update