Track the actual line length in flex-wrap as well as flex-basis lengths
Closes #27
update develop
merge updated develop