Merge clj-bot into master for repo/branch consolidation

per request:

`chrisoakman - can we move everything to one repo and one branch?`