Merge branch 'hotfix/pypi'
Bumped version.
Merge branch 'release/0.3'
Bumped version.
Merge branch 'realease/0.4'

Conflicts:
	version.txt
Merge branch 'master' of git://github.com/numba/Meta into develop