Screenshot step (commented out)
Refactor behave tests. They should now be a bit more robust
Only use a timeout on travis.