Update for for Xcode 6

Also fixed a few bugs where add button was never enabled (may need to revisit as fix was a bit brute force) and where main window segmented control bar did not look right in 10.10.