updated image on README
Change path for .psiturkconfig when using OpenShift
small change
forgot to change variable...
send adserver to OpenShift address
more general way to lookup ads via hitid (covers both types of ads)
minor clarifications to example code
Added basic OpenShift instructions to docs
Merge branch 'OpenShiftCompatible' of github.com:NYUCCL/psiTurk into dev
Merge branch 'dev' of github.com:NYUCCL/psiTurk into dev
small change
Updated docs with new instructions to get AWS keys

Amazon Web Services moved the security credentials to the AWS
Management Console at https://console.aws.amazon.com. Also as of
April 21, 2014, the AWS secret access key can no longer be
retrieved after the keys are created. The docs has been updated
with new instructions on how to create and obtain the AWS access
keys. And there are pictures.
cross referencing open shift docs
links should reference .html not .rst
Merge remote-tracking branch 'origin/dev' into modeify_server

Conflicts:
	psiturk/experiment.py
stepping version number due to change in config.txt file

the previous merge resolve the issue with the test failing