General clean-up

The project should work smoothly with lein now.