cleaned up
masterservernode cleanup
Fixing unit/test2
Adding in the merge conflicts for the fixing of test2
Fixing the chunkserver
vic merge
Merge branch 'master' of github.com:liangvic/ChunkyMonkeys
Merge branch 'master' of https://github.com/liangvic/ChunkyMonkeys
changed message field swapping conditional
Merge branch 'master' of github.com:liangvic/ChunkyMonkeys
merge conlicts 4/26 1:44PM