Fixing pull problems... hopefully
Setting version to 0.1.17
Setting version to 1.1.18-SNAPSHOT