file cleanup, start updating for new cli architecture
Merge branch 'master' of https://github.com/mohae/mog

Conflicts:
	README.md