Allow building in water (closes #238)
Remove some trailing spaces