- tweaked makefile to hopefully allow development in feature branches
- experimenting with remixing the wiki instead
- added warning
Merge branch 'wiki' into gh-pages

Conflicts:
	source/orc.rst