Make timeout configurable
Merge branch 'timeout' of git://github.com/lpgauth/bullet