fixed merge conflicts
Merge branch 'master' of github.com:ashleyrback/DQ

Conflicts:
	utils/file_manips.pyc