Moved some code into include files, added GA code, moved menu navigation items into _config.yml