latest om and requirements
Merge branch 'master' of github.com:jalehman/om-starter

Conflicts:
	src/leiningen/new/om_starter/project.clj