cleaner handling of python-common in resources

python -> common/python to avoid spurious files, and better naming in
scala resources, minor fixes

README.md

 # __python-common__
-This repository contains the common components for building a parser for the NOMAD project. The following instructions were tested on Ubuntu 14.04.
+
+
+This repository contains the common python files that are
+part of the [NOMAD Laboratory](http://nomad-lab.eu).
+The official version lives at
+
+    git@gitlab.mpcdf.mpg.de:nomad-lab/python-common.git
+
+you can browse it at
+
+    https://gitlab.mpcdf.mpg.de/nomad-lab/python-common
+
+Some things rely on having the nomad-meta-info checked out at the same level.
+The simplest way to have this is to check out nomad-lab-base recursively:
+
+    git clone --recursive git@gitlab.mpcdf.mpg.de:nomad-lab/nomad-lab-base.git
+
+then this will be in python-common within it.
 
 # Quick Install
+
+The following instructions were tested on Ubuntu 14.04.
+
 The modules used for parser development are located under the 'nomadcore' package. You can setup this package in any way you like, but a simple installation script 'setup.py' is provided for ease of use. It will install the nomadcore package along with the needed dependencies. You can install the package in development mode by calling the terminal command
 
 ```sh
@@ -40,4 +60,4 @@ or the addition can be made permanent by adding the line
 export PYTHONPATH="${PYTHONPATH}:/path/to/python-common/python"
 ```
 
-to your ~/.bashrc file.
\ No newline at end of file
+to your ~/.bashrc file.

python/nomadscripts/calculate_meta_info_overrides.py → common/python/nomadscripts/calculate_meta_info_overrides.py

@@ -216,8 +216,8 @@ def buildOverrides(oldValues, newValues):
 
 
 if __name__ == "__main__":
-    overridesDir = os.path.normpath(os.path.join(basePath,"../nomad_meta_info_overrides"))
-    defaultPath = os.path.normpath(os.path.join(basePath,"../nomad_meta_info"))
+    overridesDir = os.path.normpath(os.path.join(basePath,"../../../nomad-meta-info/meta_info/nomad_meta_info_overrides"))
+    defaultPath = os.path.normpath(os.path.join(basePath,"../../../nomad-meta-info/meta_info/nomad_meta_info"))
     usage = """usage: {command} [--check-only] [--old-ref <ref1=HEAD>] [--old-path <path=None>] [--help]
     [--new-ref <ref2=None>] [--new-path <path=basePath>] [--repo-path <repoPath=None>]
     [--overrides-dir <overridesDir>] [--no-clobber] [--verbose] [<basePath>]

python/nomadscripts/normalize_meta_info.py → common/python/nomadscripts/normalize_meta_info.py

@@ -184,7 +184,7 @@ def normalizePaths(paths, checkOnly, force, addGid, addSubGids, extraArgsHandlin
     return {"paths": paths, "hasErrors": hasErrors, "hasChanges": hasChanges}
 
 if __name__ == "__main__":
-    defaultDir = os.path.normpath(os.path.join(basePath, "../../nomad-meta-info/meta_info/nomad_meta_info"))
+    defaultDir = os.path.normpath(os.path.join(basePath, "../../../nomad-meta-info/meta_info/nomad_meta_info"))
     usage = """usage: {command} [--check-only] [--force] [--add-gid] [--add-sub-gids] [--keep-extra-args] [--remove-extra-args] [--error-if-extra-args] [file/or/dir ...]
 
     normalizes the InfoKinds file/or/dir (that defalts to {dir})