Update package name
Force to install packages we want
Cleanup of commented out lines and no longer needed attributes
Merge pull request #1 from jmccann/cleanup

Cleanup