added price fields and general clean up
Merge branch 'master' of https://github.com/JohnAmican/merch-perch