display add another x buttons consistently

In view mode if there is an existing link, contact etc then make sure an
add another button is displayed that takes you into edit mode. Also
make language on the Add another buttons in edit more consistent with
the buttons in view mode.

Fixes #618
Remove extraneous labels on edit forms

There were extra labels for several of the tabs which were creating
visual clutter
keep selected tab when switching to edit mode on org page

Detect if we are on the organization page or the persons page so we can
do the correct selector to work out which is the active tab when
switching to edit mode
retain active tab when saving changes to org/person

Add the url hash to the form action so that when the saved page is
loaded it displays the tab selected when save was pressed so it's easier
to see that changes have been saved
Switch to passport-localapikey-update module

The passport-localapikey module is no longer being maintained and the
latest version, with support for putting the API keys in the headers,
hasn't been released to the npm registry.

To work around these issues passport-localapikey-update has been
created, which has the added bonus of being updated to work with the
latest version of passport, which should hopefully reduce the chance of
problems due to differing versions.
Merge branch 'small-ui-fixes'
Make sure NODE_ENV correctly set and we're using the right master db

If NODE_ENV is not set then it will fall back to development which means
that on a production server any settings in a production config will be
ignored. To avoid this we require that NODE_ENV be set.

As a further check compare the master db name passed in on the command
line and the one that is used by a node script to make sure they agree
and bail if they don't
Upgrade popit-api in npm-shrinkwrap.json

This includes the fix for restricting pagination parameters.
Load extra vagrant configuration from another file

Allow adding to the vagrant configuration with another file rather than
having lots of conditional code based on environment variables in the
`Vagrantfile`.

This loads the file specified in the POPIT_VAGRANT_EXTRAS environment
variable, which can contain another `Vagrant.configure` block which will
add to/override settings from the main `Vagrantfile`.

See https://docs.vagrantup.com/v2/vagrantfile/index.html for more
information (under the "LOAD ORDER AND MERGING" heading).
Override public_dir in testing environment config

This prevents the tests from failing locally when there's no
public-production directory present. Which means they should run
"out-of-the-box" when e.g. creating a new vagrant box.