Cleanup the top-level astropy namespace so it doesn't have any miscellaneous stuff
Sanitize the value of COLUMNS passed to terminal_width
Catch TypeError in case COLUMNS is empty
Fix typo in _write_with_fallback
Minor pep8 issues
Add missing import for InconsistentTableError
Add missing coma
Remove orphaned code, dims is undefined
Add missing import for _unsigned_zero
pyfits -> fits
sip1db -> self.sip1db
Merge pull request #1290 from mdboom/misc/cleanup-toplevel-namespace

Cleanup the top-level astropy namespace
Allow for "whitelisting" some packages as not requireing 2to3
Include six.py in extern
Add compatibility wrapper for urlopen functionality
Refactor io.votable to not require 2to3.
Merge pull request #1291 from Xarthisius/console_fix

Sanitize the value of COLUMNS passed to terminal_width
Fixes for Python 3.2
Merge pull request #1219 from mdboom/misc/avoid_2to3

Make astropy code compatible with Python 2 and 3 without requiring 2to3
Merge pull request #1292 from Xarthisius/undefs

Fix couple of "undefined name" errors