Merge pull request #20 from brainstorm/master

Added timing to testsuite via nose-time, to see how much time each test takes
Merge pull request #1 from brainstorm/master

This fixes scilifelab pull request
#define put in bloom.c
Merge branch 'master' of github.com:tzcoolman/facs
Merge pull request #24 from tzcoolman/master

extra line tolerant for remove