Develop

First time I've done a pull request.  Let me know if there's something wrong.  Do you want me to squash away all of the different commits?  I understand that I can do that with git rebase.  (Is there a way to exclude pom.xml and project.clj?)