temp
Merge branch 'develop' of https://github.com/rfrank/ppgen into develop
Merge branch 'develop' of https://github.com/rfrank/ppgen into develop
Merge branch 'develop' of https://github.com/rfrank/ppgen into develop
Merge branch 'master' into develop

Conflicts:
	ppgen.py
Merge branch 'develop' of https://github.com/rfrank/ppgen into develop
Merge branch 'develop' of https://github.com/rfrank/ppgen into develop
Merge branch 'develop' of https://github.com/rfrank/ppgen into develop
Merge branch 'develop' of https://github.com/rfrank/ppgen into develop
Revise new .di format for better consistency

For consistency with .il and with the original 4 argument format of .di
the new 3 argument format is changed to:
  .di filename width adjustment