Issue #43 update default location after paddle has moved
Merge branch 'master' of github.com:edina/fieldtrip-open
Update VAGRANT.md
Issue #47 add pcapi dependencies
Merge branch 'master' of github.com:edina/fieldtrip-open
Issue edina/fieldtrip-spatial-memories/issues/30: Project now recognising spatial memories config.xml

The config.xml file should now be in the project root, not in www (see http://devgirl.org/2014/02/10/3-cordova-cli-changes/).
Fabfile has been modified to symlink to custom spatial memories version in www.

Added <preference name="DisallowOverscroll" value="true" /> so that screen no longer bounces.
Issue #49 upgrade to cordova 3.5
IssueID #50: add imagemagick lib on bootstrap script
Update dependencies on bootstrap.sh
Issue #38 use configparser for cross section interpolation
Merge branch 'master' of github.com:edina/fieldtrip-open
Update INSTALL_DEPS.md

add configparser to pip install
Issue #31 stop Panos putting else after curly brace
Merge branch 'master' of github.com:edina/fieldtrip-open
Issue edina/fieldtrip-gb#8 add changePageByFile helper to systests
Fix python bytecode extension to ignore
fix merge
Fix missing ~/local directory when run for first time
Update INSTALL_DEPS.md
Update INSTALL_DEPS.md