Added datastore to shorthand import list.
Merge branch 'master' of github.com:ddsc/ddsc-core
Moved security code back into lizard-security, on ddsc branch.