Shuffled the demo project inclusions around so it will build nicely.Fixes #17