Some updates to astropy.model

These are mostly things my editor (Eclipse PyDev) suggested.

@nden There are some real changes in code that is not covered by unit tests, so please review and let me know if they don't make sense.