Formatting fixes
Remove inliner warnings
Upgrade to SBT 0.13.6
Misc changes