Fix for ticket:459 test.py and test() namespace clash

 * Moved fipy/test.py to fipy/testFiPy.py

 * Decided that this was better than changing test() to testfipy()
Merge branch 'develop' into ticket459-test-namespace-clash-rebase
Merge pull request #417 from wd15/issue336-test-namespace-clash-rebase

Issue336 test namespace clash rebase