Upped the version, fixed travis and fixed some xcode6 issues