Add initial disp and inital structure default parameters.
Automatic Py3k merge for testing