Fix typo
Fiw CS warnings
Merge branch 'testing' into 'testing'

Testing

See merge request !7
Rearrange step definitions
Configure travis-ci