minor cosmetic changes, buy/remove listing now use forms
fixed merge conflicts
Merge branch 'master' of ssh://github.com/limichaelc/PTX2