test checkin
Revert "test checkin"

This reverts commit 84bce9219af09057583dc21a95758f34a8fd5ab7.
adding mod to gitignore so webstorm files don't show
Pyramid update

Pyramid is updating their sites with the shopper welcome script which
will allow them to do adpod refresh and (eventually) shopper welcome
Merge pull request #287 from cannontech/production

Production
Merge pull request #288 from gsn/production

Merged from Production.