copy tweaks
Merge branch 'master' of github.com:menslow/voltron
Updating local with master