Merge pull request #3 from jaredbischof/master

Minor updates
Updated deployment instructions
Merge branch 'master' of git.kbase.us:shock_service
updated deployment instructions
Updated Shock submodule git commit
Need to run "make" before running "make deploy"
Added commands to create upstart init files
Edited start_service and stop_service to use upstart
Added upstart config for lauching shock in a test environment
Removed unneeded targets from Makefile
Fixed path to service command
Updated path to service command
Updated test server url and port
Makefile updated for easier deploy in production
Production versus test deployment is controlled by editing a variable in the Makefile.  Thus, the shock_test upstart config script is no longer necessary.  Whether deploying in production or not we'll be using the shock.cfg upstart file.
Production versus test deployment is controlled by editing a variable in the Makefile.  Thus, the shock_test upstart config script is no longer necessary.  Whether deploying in production or not we'll be using the shock.cfg upstart file.
Pulled down update to Shock
Updated Shock to newest code
Updating to latest Shock code
Change API Url for production