Changes to accomodate GHC HEAD/7.10

base needed a major version bump due to AMP landing