Dev server
Model fix
Adding gitignore
Vagrant up
Server
Updating config
Merge branch 'master' of github.com:layla/flippermaps

Conflicts:
	server-js/app/config/defaultfields.yml
	server-js/app/config/defaults.yml
	server-js/app/config/fieldtypes.yml
	server-js/bootstrap/start.js
	server-js/index.js
	server-js/package.json
	server-js/src/app.js
	server-js/src/config.js
	server-js/src/configLoader.js
	server-js/src/db.js
	server-js/src/routes/create.js
	server-js/src/routes/delete.js
	server-js/src/routes/list.js
	server-js/src/routes/read.js
	server-js/src/routes/update.js