switch to older syntax for pytest.mark.parametrize

TravisCI is using pytest 2.3, so use the older syntax. This syntax will still work for 2.4.

Also fix issue #6 while I'm here.