Merge branch 'ma-dev'
Merge branch 'master' of https://github.com/clojurecup2014/teatrees