Update for formatting/style inconsistencies
Merge branch 'Omnityke-master'
Bump version to 1.4
Merge https://github.com/Scott90/SDCSegmentedViewController