frappe/frappe#478 fix test case
frappe/frappe#478 fixed todo and renamed hooks
frappe/frappe#478 fixed data import tool:
Merge branch 'model-cleanup' of github.com:frappe/frappe into model-cleanup