Merge pull request #17 from brainstorm/master

Several usability issues fixed, needs more human testing
conflict
Merge branch 'master' of github.com:SciLifeLab/facs
pulled the correct version from Roman
Wrong assignment of arguments
fix incorrect parameters for getopt in big_query.c
\r\n check for dos format text
dos and linux format extra line tolerant
elegant way of being extra line tolerant
Capital B for Bloom and threshold value instead of
classify help doc
Merge branch 'master' of https://github.com/SciLifeLab/facs
Added ecoli with chapmanb modifications
Merge
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
Remove unused imports
Fix silly indentation error, added hg19
hg19 too big for travis, the whole testsuite just times out