removed old dropbox integration
remove link to old config
puma config for upstart usage
merge changes