include the IV in the HMAC

and optionally still allow HMACs that didn't have it
extract hmac into helper function

and fix bug where we passed iv twice
Merge pull request #13 from ccutrer/iv_in_hmac

include the IV in the HMAC