Upgrade to fm-sbt-common 0.5.0
Some misc cleanup