Merge pull request #10 from 7gportal/master

new fabfile needed for prod deploy
generatemedia
media changes
generatemedia
merge
generatemedia
coming soon
put site back up
merge resolving conflict