Merge branch 'master' into admin
Allow uploading of member profile pics to server.
Handle file upload to server for committee meetings.
Merge branch 'master' into admin
Add simple S3 upload function, using boto.
Upload files to S3 after saving them to disc.
Merge branch 'master' into admin

Conflicts:
	config/development/config.py
Create upload directory on startup, if it doensn't already exist.
Catch exceptions while uploading to S3. Add logging.
Remove some old comments.
Configure boto as part of fab deploy.
Merge branch 'admin'
Merge branch 'master' of github.com:Code4SA/pmg-cms-2

Conflicts:
	config/development/config.py