Remove calls to vicerror (replace with nrerror)
Merge branch 'feature/reorg' into feature/image
Initial call to vic_run()