idea ignore, removed api info
Merge branch 'rackspace' into aws
AWS-FOC: initial push/test
AWS-FOC: forgot aws package
AWS-POC: error debug
AWS-POC: change back to imagemagic
AWS-POC: testing 304
AWS-POC: more 304 testing
AWS-POC: added config
AWS-POC: added config - and config file
POC-AWS: not allowing w/h greater than orig
POC-AWS: adding IP check to post
POC-AWS: adding IP check to post
POC-AWS: adding IP check to post
POC-AWS: adding IP check to post
POC-AWS: adding IP check to post
POC-AWS: adding IP check to post
POC-AWS: fixed lastmodified
POC-AWS: moved 304 up the stream
Merge pull request #6 from glawson/aws

Merged AWS change to master