Merge branch 'hotfix/v1.5.1' into develop
Merge branch 'hotfix/vagrant' into develop
adding vim options to support backspace
adding fitbit
updating gitconfig
merged with master
Merge branch 'release/v1.5.4'