simple placehold.it like placeholder image support
mucking about with the font sizes
requirements!
latest boto
fabfile and updated requirements
removing generated requirements file for pypy
fix some warnings
updating fabfile to copy conf.sh up to the server(s)
Merge branch 'master' into placeholders

Conflicts:
	giraffe.py
Merge pull request #13 from steder/placeholders

Placeholders and a fabfile!