Update podspec and travis yml

Update cocoapods before travis build

Correct travis syntax

Remove ios6 from travis builds

Update podspec to 7.0
Adjust spacing
Merge in master