Updated to remove dependency on spark. Also merged in changes from accounts-ui-unstyled
updated mrt version #