Merge branch 'feature/UnitTesting' into release/0.0.2

Conflicts:
	.core/core.class.php
Merge branch 'develop' into feature/UnitTesting
Merge branch 'pr/9' into release/0.0.2

Conflicts:
	.core/modules/data/email.class.php
	.core/modules/data/site.class.php
	.settings/settings.php
Merge branch 'develop' into feature/UnitTesting
Trying out automatic travis ci image
Merge branch 'develop' into feature/UnitTesting
Merge branch 'develop' into release/0.0.2

Conflicts:
	.core/core.class.php
Forcing failure
Testing complete
Merge branch 'feature/UnitTesting' into develop
Merge branch 'develop' into release/0.0.2
Merge branch 'release/0.0.2'
Merge pull request #9 from TheRyanHowell/master

Pull Ryans code into my repo
Merge pull request #10 from MobliMic/master

Update