Merge package-template updates into photutils

Making a coverage report for photutils currently doesn't work:
```
$ python setup.py test --coverage
...
error: /var/folders/sb/4qv5j4m90pz1rw7m70rj1b1r0000gn/T/astropy-test-swo62V/lib.macosx-10.9-x86_64-2.7/photutils/tests/coveragerc: No such file or directory
```

@astrofrog Should I try to merge the recent fixes from `package-template` into `photutils`? Or do you think  https://github.com/astropy/package-template/pull/46 will be merged soon and we should wait for that?