Updates from EC2 Server
Merge branch 'master' of https://github.com/yoavfreund/UCSD_BigData