OSX 10.10 compatibility

Hi, I fixed whatever issues came up on OS X 10.10. There were just a few minor problems.
The app now successfully runs on my machine, which is running the latest Yosemite preview.

The commit messages go into more details.