Adding a group_filter function, rearrange package
Update gitignore
Merge branch 'master' into group_filter

Conflicts:
	.gitignore
Add tests for grouping functions