Update build system to use whatever the fuck we just did, refs #519 too (where is my kaffe?)