Dictionary Development, master branch (2017.04.26.)

Unfortunately the previous version of the code was not handling the PACKAGE_VERSION compiler definitions quite correctly during dictionary generation. Which I only noticed when trying to build Athena with the updated code. ☹ But now I'll extend my dictionary generation testing code to check for the correct handling of PACKAGE_VERSION as well.