Update for Xcode6.1 Swift version
Add scalar wrappers to try and improve Swift arithmetic