Merge branch 'bubbles'
Added amazon boto to requirements
Removing data directory (all assets now stored in s3)