Merge branch 'master' of github.com:techdragon/ophiology

Conflicts:
	ophiology/main.py
	ophiology/tools/checkstyle.py
Merge branch 'master' of github.com:techdragon/ophiology