Merge pull request #465 from perroe/windows_compile_fix

Windows compile fix
Merge branch 'master' of https://github.com/Ensembles/ert into ERT_559_plot_units