Merging NoLips to master. Major changes to ADM_prox in NoLips. Major changes to FileIO in master. We'll see how this goes.