Merge branch 'moves-wizard'
minor changes (mostly style warnings)
Merge pull request #25 from nlohmann/housekeeping

Housekeeping