Update README and fix travis conf