Security updates: Upgraded ctools to 7.x-1.4 and entity to 7.x-1.4 in springboard-core.make.
Patch services module makefile to use correct URL for the Spyc.php library.

See Drupal.org issue: https://www.drupal.org/node/2200269
removed the extra definition for token_filter. They were both pointing at the same commit of token_filter currently, but I left the more specific one in.
changed springboard versions to 4.x
Merge pull request #31 from JacksonRiver/7.x-4.x-services-spyc-php

Patch Services module makefile to use correct URL for Spyc.php
Merge branch '7.x-4.x' into 7.x-4.x-contrib-security-updates-2014-04

Conflicts:
	springboard-core.make
Merge pull request #21 from JacksonRiver/7.x-4.x-contrib-security-updates-2014-04

Security updates: Chaos Tools 1.4
Merge branch '7.x-4.x' into 7.x-4.x-145-contrib-modules-dev-releases-specific-sha