Merge pull request #3 from mattdw/master

Add setup.py to make cms installable by python package tools
remove the need for an UPLOAD_PATH setting in the project's settings.py
Merge branch 'master' of git://github.com/gregplaysguitar/djangocms2000
image placeholder display tweaks
readme update
Merge branch 'master' of git://github.com/gregplaysguitar/djangocms2000
jquery.tinymce.js fixed
readme
Allow width-only or height-only image resizing.
Merge branch 'master' of git://github.com/gregplaysguitar/djangocms2000
console.log
Allow colorspace argument in cmsimages
Update readme.markdown
deprecated url import fixed
Added initial south migration. Bumped version to 1.0
south field triple
Merge branch 'master' of git://github.com/gregplaysguitar/djangocms2000
logic ordering to avoid touching session, if necessary
Merge remote branch 'origin/master'
Update readme.markdown