Changed settings
Merge https://github.com/jordanly/jordan-ly.com

Conflicts:
	jordan_ly_site/jordan_ly_site/settings.py
	jordan_ly_site/jordan_ly_site/settings.pyc
fixed settings