Fix some errors not initially picked up by vera++.

Import the newest vera++ which fixes vera++ warnings treated as warnings
instead of errors even when ERROR was specified, fix acceptance_tests vera++
target not being created and fix some errors vera++ found in those tests.

Also remove a backup file
Merge pull request #25 from smspillaz/yiqi.item_20

Fix some errors not initially picked up by vera++.

Import the newest vera++ which fixes vera++ warnings treated as warnings
instead of errors even when ERROR was specified, fix acceptance_tests vera++
target not being created and fix some errors vera++ found in those tests.

Also remove a backup file