Also include a mechanism to look up the proper ArmoryQt.py file.
Merge branch 'fixmakefile'