Changed formating
Fixed travis build to work with ios7