Make travis work by disabling not working stuff
Remove/disable unused travis options
Merge pull request #5 from rail/cleanup

Cleanup