merge updates alexandros
Merge branch 'api' of https://github.com/lsds/SEEP into api
config