modified blog instructions
fixed merge conflicts
removed whitespace
updated instructions to clarify what's necessary
Merge remote-tracking branch 'upstream/master'