Changed make_aware() to use current timezone as the default timezone