fixing test and updating gitignore to cover the config
Merge branch 'master' into Algo
getting tests and things working
Merge branch 'master' into Algo

Conflicts:
	test/test-3-scale-communicator.js
getting tests passing again
getting the call made
pushing up tests and simon
 resolving conflict
Merge pull request #4 from cbdr/Algo

Algo