BUG: restore 10.1 expand_repr behaviour, only for < max_cols, if wider then term GH3706
#3706

I guess need to rollback tests comparisons as well? 

https://travis-ci.org/pydata/pandas/jobs/7621636
 Thanks jeff, pushed 09e47bc.
