Last minute distributed changes
Merge branch 'master' of github.com:jmowry/parallel_final_fall14