updated build stuff and small merge fixes.

Signed-off-by: Sean Ogden <positivelyskewed.sf@gmail.com>