Merge pull request jatoben#30 from jatoben/travis-xcode7 Re-enable Travis builds
Merge branch 'IngmarStein-master'
Merge pull request jatoben#4 from lancep/master Another change to the readme