Merge pull request #78 from darinmorrison/master

Fix warnings wrt unnecessary mut
Give the type-checker hints to avoid annotations