Remove shortcodes from local directory.
Add piwik (including update to theme submodule).