Merge branch 'devel' of github.com:cameronraysmith/eem into devel

Conflicts:
	src/julia/src/main.jl
Merge branch 'devel' of github.com:cameronraysmith/eem into devel