Changed make_aware() to use the current timezone by default