Final commit (No seriously, this is it), cleaned up code.
Merge branch 'master' of https://github.com/akbernath/bigdata_proj1