Merged a few pull requests from master

Merged https://github.com/zurb/joyride/pull/84 and https://github.com/zurb/joyride/pull/73