Tweaked discussion of installing XCode command line tools
remove explicit inclusion of css file
Updated based on comments from @astrofrog and @jiffyclub
Merge pull request #737 from kbarbary/fix-theme-css-import

Remove explicit inclusion of theme css file
Merge pull request #730 from eteq/docs/note-clxcode-option

Tweaked discussion of installing XCode command line tools
Fix python3 failure in find_api_page
Add clarifying comment
added timeout to find_api_page
Minor docstring fix found here: https://github.com/astropy/astropy/commit/9fd81ec01a86bb6474c50f851686d0c07d640442#commitcomment-2573463
Adds a 1 sec timeout to the find_api_page tests
correct units of cgs.k_B to erg/K
Merge pull request #738 from mdboom/vo/doc-fixes

Minor docstring fix for io.votable
Merge pull request #740 from zblz/boltzmann

correct units of cgs.k_B to erg/K
Update the docstring to not reference urllib2 (which is not in py 3.x) as suggested by @astrofrog
Changed find_api_page timeout to 3
Merge pull request #739 from eteq/find_api_page_fixes

Fixes to find_api_page function
Fix typo in doctest (thought I already had fixed this but maybe it got lost in a merge)
Merge branch 'master' of github.com:astropy/astropy
added new timer module
added timer codes and docs, still need to add tests