Made changes to make it build under beta 4

Sam, not sure these changes are all correct, pulled your project to learn more about Swift, but at least it builds. 

It doesn't run yet due to some really, really weird error message (and maybe due to me never-ever running a Mac app before), but it does build haha.