Merge changes for fitbit plugin

Sorry for all the useless commits... Don't know how to remove them