Updated to make whether or not to use the amalgamation a separate configuration option