Fixed typo
Added flag to force joining of two files to ncjoin.py (enabled by prefixing file name with a '+').
Merge branch 'master' of github.com:pastewka/atomistica