Cleaned up project for staging.
Merge branch 'develop' of github.com:bobbysciacchitano/mplocker into develop