Merge branch 'yuidoc' of https://github.com/andrewnicols/mdk into yuidoc

Conflicts:
	mdk/config-dist.json
	mdk/workplace.py

diff --cc README.rst
Simple merge

diff --cc mdk/commands/js.py
Simple merge

diff --cc mdk/config-dist.json
Simple merge

diff --cc mdk/js.py
Simple merge