Re-added rest_funcs to models modules
Merge branch 'jon' of https://github.com/puruckertom/ubertool_eco into jon