Cleaning up and Berkshelf'ing loganov-jenkins.