More build scripts stuff.
Merge pull request #19 from MatthewJA/master

More build scripts stuff.