lein new
Merged master with conflicts resolved