Updated for 2.10 and SBT 0.12