Merge tag '0.95a1' into development

0.95a1
Bump for version release
Merge tag '0.95a4' into development

0.95a4

Conflicts:
	setup.py
Travis update