Add a timeout option to falkor, and clean up other options

Hello @dpup, 

Please review the following commits I made in branch 'nick-timeout'.

25dfe5e49405b56e09deb7939e08ceb0fe7ee201 (2014-05-12 21:38:33 -0400)
Add a timeout option to falkor, and clean up other options

R=@dpup