Fix for aggregations.
Another fix for writing keywords.
Add handler for unknown unit keyword.
for #978
Merge remote-tracking branch 'origin/develop' into fix_aggregation
Replace all normalized to normalised.
Merge pull request #982 from ismailsunni/fix_wizard

Fix wizard
Tested under Ubuntu 12.04.