Merge branch 'master' of github.com:gwu-libraries/social-feed-manager
Merge branch 'master' of github.com:gwu-libraries/social-feed-manager
Merge branch 'master' of github.com:gwu-libraries/social-feed-manager
Merge branch 'master' of github.com:gwu-libraries/social-feed-manager
added first cut at new install file, refs #184
added apache integration, refs #184
Cleaned up old README, closes #184
fixed typo, refs #184
Merge branch 'master' of github.com:gwu-libraries/social-feed-manager
merged master, fixed conflicts, refs #184
Added note to optionally cd to desired directory before git clone-ing; added recommendation for DATABASE['HOST'] value of 'localhost' in local_settings.py
Removed extraneous ./manage.py migrate step that appears to have been inadvertently left in prior to creating the db tables with syncdb
spelling fix (colleag_u_e); changed m4_002 references to m5_001
Added more detail as to where the API key and API secret are located on the dev.twitter.com screen
Merge pull request #236 from gwu-libraries/t184-install-config-doc

T184 install config doc