clean some stuff up
Merge github.com:openmedi/wikiopenmedi

cleanup needs merge