Rename history to history_server so binary name doesn't clash with directory name.
Merge branch 'master' of https://github.com/skishore/dropblox