Fixed a bunch of stuff; Build system is working now!
Merge branch 'master' into ws