Add return code in function doco
Remove superflous documentation
Add lock_dir environment variables to tests

mostly for travis' sake. This particular commit may fail with functions
other than marquise_init, but marquise_init should be successful
Add more environment variables for MARQUISE_LOCK_DIR
Merge branch 'lockfile' into optional_namespace