Cleaning up.
Deletions.
Pulling out terminal in the carousel. Updating.
Copied local_settings into dev settings.
Deleted local_settings.tmpl
Merging in new changes.
Moved piwik