Cleaned up code and added initial Solaris 11 IPS package support