cleanup
Merge branch 'master' of https://github.com/addwittz/motionmill

Conflicts:
	css/style.css
	includes/class-mm-array.php
	includes/class-mm-file.php
	includes/class-mm-form.php
	includes/class-mm-image.php
	includes/class-mm-plugin.php
	includes/class-mm-template.php
	includes/class-mm-wordpress.php
	motionmill.php
	plugins/motionmill-dashboard-widget/motionmill-dashboard-widget.php
	plugins/motionmill-general/motionmill-general.php
	plugins/motionmill-google-analytics/motionmill-google-analytics.php
	plugins/motionmill-login/motionmill-login.php
	plugins/motionmill-mail/includes/templates.php
	plugins/motionmill-mail/motionmill-mail.php
	plugins/motionmill-roles/motionmill-roles.php
	plugins/motionmill-settings/css/style.css
	plugins/motionmill-settings/motionmill-settings.php