Made some updates for cleanup.
Merge pull request #1 from kwhat/5.0

Merging 5.0 changes into the master, preparing for Xcode 6.0