update travis
update podspec to point to correct repo
Merge branch 'conf.update'