Merge Ben's Development Branch into Master with SPL reading files.

This will add in the SPL reader code to the master.