got everything merged in from master, including xls/xlsx parsers and all bug fixes