removed executable bit on test file (nose doesn't collect tests from executables)
Merge branch 'dev' into merger