Allow timeout to be set (Virgilio 2.1). Added and cleaned up tests. Swit...

...ched to Gulp.