updated .gitignore
Merge branch 'develop'

Conflicts:
	.gitignore
Merge branch 'develop'

Incorporating changes for v0.3 release.
Merge branch 'release-0.4'
Merge branch 'master' into develop