Small updates to Xmf

template renames, PSR-2 changes
Actually works again
Merge remote-tracking branch 'upstream/master'
Merge pull request #145 from geekwright/master

Xmf cleanup, misc fixes