See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1197

Run 'bundle install' and 'npm install' in only one place in the
Makefile, and reorganize so that 'gdk update' and 'gdk reconfigure'
run 'bundle install' + 'npm install'.

This reverts merge request !241

Closes https://gitlab.com/gitlab-org/gitlab-development-kit/issues/185

added .gitlab-npm to touch target during setup

This is a cause of problems for users. Although we already made fixing
it easy (gdk reconfigure) it was still hard for users to detect /
understand what was wrong.

```
[ruben@mbp ~/projects/gdk-ce (master *)]$ gdk reconfigure
(in /Users/ruben/projects/gdk-ce)
rm -f \
            gitlab/config/gitlab.yml \
            gitlab/config/database.yml \
            gitlab/config/unicorn.rb \
            gitlab/config/resque.yml \
            gitlab-shell/config.yml \
            redis/redis.conf \
            Procfile
sed -e "s|/home/git|/Users/ruben/projects/gdk-ce|"\
             gitlab/config/gitlab.yml.example > gitlab/config/gitlab.yml
port= support/edit-gitlab.yml gitlab/config/gitlab.yml
  gitlab_shell:
sed "s|/home/git|/Users/ruben/projects/gdk-ce|" database.yml.example > gitlab/config/database.yml
cp gitlab/config/unicorn.rb.example.development gitlab/config/unicorn.rb
echo "listen '/Users/ruben/projects/gdk-ce/gitlab.socket'" >> gitlab/config/unicorn.rb
sed "s|/home/git|/Users/ruben/projects/gdk-ce|" redis/resque.yml.example > gitlab/config/resque.yml
command -v bundler > /dev/null || gem install bundler
sed -e "s|/home/git|/Users/ruben/projects/gdk-ce|"\
              -e "s|^gitlab_url:.*|gitlab_url: http+unix://%2FUsers%2Fruben%2Fprojects%2Fgdk-ce%2Fgitlab.socket|"\
              -e "s|/usr/bin/redis-cli|/usr/local/bin/redis-cli|"\
              -e "s|^  socket: .*|  socket: /Users/ruben/projects/gdk-ce/redis/redis.socket|"\
              gitlab-shell/config.yml.example > gitlab-shell/config.yml
GOPATH=/Users/ruben/projects/gdk-ce/gitlab-workhorse go install gitlab.com/gitlab-org/gitlab-workhorse/...
ln -s /Users/ruben/projects/gdk-ce/gitlab/.ruby-version .ruby-version
ln: .ruby-version: File exists
make: *** [.ruby-version] Error 1
```

This was an oversight in the Makefile. Most of the time some piece of
application code would make the directory anyway with `mkdir -p` but
we should do it eagerly, not lazily.

This allows you to use more Go tools during development.