Squashed commit of the following:

commit b2c3573f01cb43d88e90b47bc6112bd8276f1ead
Author: Brian Lee <brian.kihoon.lee@gmail.com>
Date:   Sun Jun 9 11:06:22 2013 -0400

    more updates... buggy urls.py

commit bb6deaed92c7d1adb5b91737e352102b2250378a
Author: Brian Lee <brian.kihoon.lee@gmail.com>
Date:   Sun Jun 9 10:53:16 2013 -0400

    updates to settings for better portability