Fixes database bug of saving to the same track name twice - changed from save to update function
Merge branch 'errorLoggingRefactor' into dev
Merge branch 'dev' of https://github.com/Panoptico/NetSense into dev
Merge branch 'dev' of https://github.com/Panoptico/NetSense into dev

Conflicts:
	server/twitter/stream_controllers.js
Merge branch 'dev' of https://github.com/Panoptico/NetSense into dev