first round of updates for magento starterkit
Merge branch 'macport' of https://github.com/g-milligan/newfiles_java into macport