Edits for the night 10/1/2013 - 10/2/2013
Merge remote-tracking branch 'origin/master'