use correct package to get pip
explicitely use make rather than rake
Merge remote-tracking branch 'github/master'
fixed xml for section 4: Terminology