With quantity output, ensure non-quantity input is treated as dimensionless - #2571

In [1]: import astropy.units as u, numpy as np

In [2]: s = 1.*u.m

In [3]: np.arctan2(1., 1., out=s)
Out[3]: <Quantity 0.7853981633974483 rad>

In [4]: s
Out[4]: <Quantity 0.7853981633974483 rad>

In [5]: np.arctan(1., out=s)
---------------------------------------------------------------------------
AttributeError                            Traceback (most recent call last)
<ipython-input-5-5673edf1ef20> in <module>()
----> 1 np.arctan(1., out=s)

/usr/lib/python2.7/dist-packages/astropy/units/quantity.pyc in __array_prepare__(self, obj, context)
    200         # the unit the output from the ufunc will have.
    201         if function in UFUNC_HELPERS:
--> 202             scales, result_unit = UFUNC_HELPERS[function](function, *units)
    203         else:
    204             raise TypeError("Unknown ufunc {0}.  Please raise issue on "

/usr/lib/python2.7/dist-packages/astropy/units/quantity_helper.pyc in helper_dimensionless_to_radian(f, unit)
     94     from .si import radian
     95     try:
---> 96         scale = unit.to(dimensionless_unscaled)
     97     except UnitsError:                                                  
     98         raise TypeError("Can only apply '{0}' function to "             

AttributeError: 'NoneType' object has no attribute 'to'