Update .gitignore
Merge branch 'pr/5'

Conflicts:
	.gitignore
Update gitignore again
Release 0.1.4
Bump to 0.1.5-SNAPSHOT