Merge pull request #18 from tzcoolman/master

extra line tolerant
Merge branch 'master' of https://github.com/SciLifeLab/facs
Add nose-timer for individual test timing