Merge branch 'master' of github.com:normalocity/cortex

0c585d6 - Merge branch 'master' of github.com:normalocity/cortex

When you don't do an initial commit that is really ready, you wind up rebuilding your repo and merging stuff. Ugly, but many projects sputter at first. Not a big deal.