Issue #1149: armour → armor

Fix for #1149: Replace all occurences of armour (english) by armor (american)