Updated keywords
Updated travis configuration
Line breaks :/