minor edits
Merge branch 'master' of https://github.com/leamofy/acl-2014
Merge branch 'master' of https://github.com/leamofy/acl-2014
various edits throughout