upgrades to lein 2; refactors formatting