Added support for Awareness
Merge branch 'awareness' of https://github.com/lachlancooper/mackup into lachlancooper-awareness

Conflicts:
	CHANGELOG.md