Merge branch 'develop'
Merge branch 'master' of github.com:orzubalsky/fantastic-futures
Merge branch 'develop'
Merge branch 'develop'
removing unused kml files
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of github.com:orzubalsky/fantastic-futures
changed performance url and added a link to the main site
changed spacing
changed url for performance
new setup and deployment scheme
updated fabfile