update for AMS changes
Merge branch 'resque' of github.com:cloudspace/rss.cloudspace.com into resque
changes for AMS