first try at test function
Merge branch 'master' of http://github.com/kthyng/scipy-2013-git-testing