Merge pull request #16 from ucam-smt/lmert

Lmert
Remove redundant typename

g++ 4.8.2 (Ubuntu) didn't notice it, but
g++ 4.2.0 (SUSE linux) was unhappy.
Fix lmert compilation

- lmert was not compiling with g++ 4.2
- also re-indent some code appropriately.