Return failure code when lint fails.
Fix bug 436. Only restore axes that remain after an option update.
Merge pull request #222 from kberg/master

Fix bug 436, and include a lint change.