updated with latest joyride, misc bugfixes
Merge pull request #1 from scald/master

updated with latest joyride, misc bugfixes