Merge branch 'master' of git://github.com/echown/nbites
Merge branch 'joint_delay' of git://github.com/joshimhoff/nbites
Merge branch 'bugfixes' of git://github.com/jzalinger/nbites
Merge branch 'orbit' of git://github.com/dzeller/nbites