Step iteration complete
Merge branch 'contribute' of https://github.com/Make-Magazine/makeblog into contribute

# By Jake Spurlock
# Via Jake Spurlock
* 'contribute' of https://github.com/Make-Magazine/makeblog:
  Swap parts and tools around.