Merge pull request #24 from lbondaryk/1124-non-recordable-mc_ysap

Using newer version of MCP config for test
adding cache and nock cleanups to the integration tests
unit tests.  refactor IF statement to make it more readable.  remove commentary for an unneeded story
remove superfluous maxAttempts
Merge pull request #23 from lbondaryk/1124-non-recordable-mc

1124 non recordable mc
Updated controller to serve images, updated config for imgDir, stubs for sending new imgBaseUrl config var back to IPC
Merge pull request #25 from lbondaryk/142-MultipleChoice_server_feedback

142 multiple choice server feedback
Merge branch 'master' into 1360_serve_images
added imgBaseUrl to ActivityConfig
Changed imgBaseUrl config.  Added some config explanation in README
Update README to make startup accurate.  Changed so we have individual user local.json.USER
Update README to reflect move to local.json symlink
add logger statement
Merge pull request #26 from lbondaryk/1360_serve_images

1360 serve images
Added amsproxy unit test
Merged with master, unit test retrofit