edits
Merge branch 'dev' of github.com:markkerzner/HadoopIlluminated into dev