Updating and fixing

Updated project for Xcode 6. Cleared out some warnings. Fixed control
text bug that was causing layout issues.