Upgrade to D7
Remove themes
Remove all
New olimpo site
Add swp files
Merge branch 'master' into d6