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

Conflicts:
	motionmill.php
	plugins/motionmill-assets/js/plugins.js