Add ruby21 and remove ruby18