ENH: Adjust timeout for tests running under Valgrind

STYLE: Miscellaneous minor style fixes
Merge pull request #21 from jamiesnape/ValgrindTimeout

ENH: Adjust timeout for tests running under Valgrind