Changes required to allow building on Eclipse Luna.

Tested by building against both Eclipse Kepler and Eclipse Luna.
Merge pull request #115 from mbooth101/luna-build

Changes required to allow building on Eclipse Luna.