Merge branch 'master' into kill-unittest

Kevin Burke · Kevin Burke · commit 9e1f9c7167df · 2014-01-24T22:49:30.000-08:00
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Python library documentation")
 Install from PyPi using [pip](http://www.pip-installer.org/en/latest/), a
 package manager for Python.
 
-    $ pip install twilio
+    pip install twilio
 
 Don't have pip installed? Try installing it, by running this from the command
 line:
@@ -24,7 +24,7 @@ Or, you can [download the source code
 (ZIP)](https://github.com/twilio/twilio-python/zipball/master "twilio-python
 source code") for `twilio-python`, and then run:
 
-    $ python setup.py install
+    python setup.py install
 
 You may need to run the above commands with `sudo`.
 
diff --git a/docs/_themes/kr_small/layout.html b/docs/_themes/kr_small/layout.html
@@ -14,7 +14,7 @@
 {% block relbar1 %}{% endblock %}
 {% block relbar2 %}
   {% if theme_github_fork %}
-    <a href="http://github.com/{{ theme_github_fork }}"><img style="position: fixed; top: 0; right: 0; border: 0;"
+    <a href="https://github.com/{{ theme_github_fork }}"><img style="position: fixed; top: 0; right: 0; border: 0;"
     src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
   {% endif %}
 {% endblock %}
diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@
     description = "Twilio API client and TwiML generator",
     author = "Twilio",
     author_email = "help@twilio.com",
-    url = "http://github.com/twilio/twilio-python/",
+    url = "https://github.com/twilio/twilio-python/",
     keywords = ["twilio","twiml"],
     install_requires = REQUIRES,
     packages = find_packages(),
@@ -49,7 +49,7 @@
     DESCRIPTION
     The Twilio REST SDK simplifies the process of making calls using the Twilio REST API.
     The Twilio REST API lets to you initiate outgoing calls, list previous calls,
-    and much more.  See http://www.github.com/twilio/twilio-python for more information.
+    and much more.  See https://www.github.com/twilio/twilio-python for more information.
 
      LICENSE The Twilio Python Helper Library is distributed under the MIT
     License """ )
