Updated to add Singularity and Toolkit
Merge branch '7.x-1.x' of github.com:bmx269/parrot into 7.x-1.x