Removed the changes which broke the settings

Commented out functions in the file transfer that don't work yet
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace