More numpy support
Merge branch 'master' of github.com:HIPS/FunkyYak

Conflicts:
	funkyyak/core.py