Minor corrections.
Improved cmake support for finding external modules
Merge branch 'devel' of github.com:ElmerCSC/elmerfem into devel

Conflicts:
	CMakeLists.txt