fixed careless merge
Updated settings for prose.io
CI skip for travis
Travis