Added an exclude for ~ files so that they don't clog up git status
Merge branch 'master' into development