Merge branch 'master' of github.com:openelementary/openelementary

Conflicts:
	.gitignore