Merge branch 'master' into develop
Merge branch 'master' of https://github.com/ryanorsinger/myconfig into develop
Update and remove deprecated information.
Merge pull request #3 from ryanorsinger/develop

Remove deprecated items, update filenames