Minor changes to terminology and updates to reflect the 2014 Pi kit

Note: contains things to fix marked as commented-out note environment