Squashed commit of the following:

commit 2a12b6cf38911031ef2cd20634b9c6eb5ed0043c
Merge: d25463e 0d6700f
Author: Dan Kerchner <kerchner@gwu.edu>
Date:   Mon Jun 23 17:44:46 2014 -0400

    Merge pull request #233 from gwu-libraries/t229-csv-data-dictionary

    T229 csv data dictionary

commit 0d6700f03ceb8ee7edef6285e0df17892c9f64cb
Author: Laura Wrubel <lwrubel@gwu.edu>
Date:   Mon Jun 23 14:00:56 2014 -0400

    additional edits

commit 587fcc6a224db4a738f3807030b5a8cc535fe196
Author: Laura Wrubel <lwrubel@gwu.edu>
Date:   Mon Jun 23 13:53:33 2014 -0400

    added intro statement

commit 3448260ab0e77e3c7c8513acef9f67a5df3bd119
Author: Laura Wrubel <lwrubel@gwu.edu>
Date:   Mon Jun 23 13:47:23 2014 -0400

    creating page content with table

commit 79355bbe85389d651f9cf78a9837eec6a710b900
Merge: d25463e 686209a
Author: Laura Wrubel <lwrubel@gwu.edu>
Date:   Mon Jun 23 10:46:40 2014 -0400

    Merge branches 't229-data-dictionary' and 't229-csv-data-dictionary' into t229-csv-data-dictionary

commit 686209abe1120ffa4094a7f38550a377f7b07401
Author: Laura Wrubel <lwrubel@gwu.edu>
Date:   Tue Jun 17 17:14:19 2014 -0400

    partial table

commit d25463e16484c708307b79a5af314bb5aa305298
Author: Dan Chudnov <dchud@umich.edu>
Date:   Tue Jun 10 14:59:26 2014 -0400

    No explicit need for this just now.

commit 247c7d06e10ebbbb55cf03db6c31b11fb8861646
Author: Dan Chudnov <dchud@umich.edu>
Date:   Tue Jun 10 14:59:06 2014 -0400

    No explicit need for this.

commit ca8a06649c465cfd9026923a122a104375ac860f
Merge: fbfbd3f 3c72268
Author: kerchner <kerchner@gwu.edu>
Date:   Tue Jun 10 12:37:40 2014 -0400

    Merge branch 'master' into t199-changes-release-notes

commit 51239e9c5bfd0c4927fdf337c7b0b931e90574e5
Merge: a91fc16 3c72268
Author: kerchner <kerchner@gwu.edu>
Date:   Tue Jun 10 12:33:10 2014 -0400

    Merge branch 'master' into t187-mgmt-cmds-docs

commit 3c722683f351671da044aeac15a7b15f567b665a
Merge: 1653d84 ac78807
Author: kerchner <kerchner@gwu.edu>
Date:   Tue Jun 10 12:26:54 2014 -0400

    Merge branch 'm5-001-integration'

commit add63c4451608e86c69e81042a7214c425c9d48a
Merge: 96b5ae2 1653d84
Author: Daniel Chudnov <dchud@gwu.edu>
Date:   Tue Jun 10 07:56:24 2014 -0400

    Merge branch 'master' of github.com:gwu-libraries/social-feed-manager

commit 1653d84b165024080c5c3ba447710ec7ef840d36
Merge: 6af3f3c d3487ea
Author: Dan Chudnov <dchud@umich.edu>
Date:   Tue Jun 3 13:28:21 2014 -0400

    Merge pull request #216 from gwu-libraries/t154-supervisord-xmlrpc

    T154 supervisord xmlrpc

commit d3487ea693bfb9f780db76f891551153ccb9e3a2
Author: Daniel Chudnov <dchud@gwu.edu>
Date:   Tue Jun 3 13:27:02 2014 -0400

    tweaked examples/layout in settings template following review of pull request, refs #154

commit a91fc1632bd64648add4524dbc2544a07ebbc015
Author: kerchner <kerchner@gwu.edu>
Date:   Sun Jun 1 18:42:20 2014 -0400

    Edited fetch_tweets_by_id

commit ba0c331dd63be140c4c7325bae41dc1acf8082a1
Author: Ankushi Sharma <anksharm@gwmail.gwu.edu>
Date:   Fri May 30 11:41:44 2014 -0400

     added the fetch_tweets_by_id command section

commit ac78807105938085f5c0a0b6a06d561a2c82dfd1
Merge: dfc30c9 bae4a44
Author: kerchner <kerchner@gwu.edu>
Date:   Thu May 29 21:31:26 2014 -0400

    Merge branch 't188-faq' into m5-001-integration

commit bae4a44a8f4ced0f78ee715e5d04e29696569dc6
Author: kerchner <kerchner@gwu.edu>
Date:   Thu May 29 21:30:18 2014 -0400

    Resolved TODO - we can elaborate when there's more to say.

commit dfc30c934c0c3c50278da21d958fa431e43ef284
Merge: 791bd4f 812d879
Author: kerchner <kerchner@gwu.edu>
Date:   Thu May 29 21:07:19 2014 -0400

    Merge branch 't193-user-lifecycle' into m5-001-integration

commit c7587959558f76732fa91dc886a34a2a1721095f
Author: kerchner <kerchner@gwu.edu>
Date:   Thu May 29 13:03:14 2014 -0400

    updated streamsample size info; revised organizedata section

commit fbfbd3fbed3d4fa3ece7c3d850e4be3c0ea3d9b6
Author: Ankushi Sharma <anksharm@gwmail.gwu.edu>
Date:   Thu May 29 12:15:49 2014 -0400

    included a draft for m5_001 release

commit b604ccda01e548eebfd446ee3fa12d2cec5c68ae
Author: kerchner <kerchner@gwu.edu>
Date:   Thu May 29 12:04:12 2014 -0400

    Updated streamsample and filterstream

commit 96b5ae2714d8010b249bd354ce03921baff4e420
Merge: ede67b8 6af3f3c
Author: Daniel Chudnov <dchud@gwu.edu>
Date:   Tue May 27 17:57:31 2014 -0400

    Merge branch 'master' of github.com:gwu-libraries/social-feed-manager

commit 4888896f6e87541e7755ff5bb15feb605cdd3594
Author: Ankushi Sharma <anksharm@gwmail.gwu.edu>
Date:   Tue May 27 17:17:32 2014 -0400

    changes to include new file for m4_002

commit 16ee634453845bf62f102b7539f5d6c06852d1aa
Author: Ankushi Sharma <anksharm@gwmail.gwu.edu>
Date:   Tue May 27 17:10:34 2014 -0400

    added new file for m4_002 release

commit 3b730a86af99f42145ca1b0a54b75bb44c783ef7
Author: Laura Wrubel <lwrubel@gwu.edu>
Date:   Tue May 27 15:54:36 2014 -0400

    Update faq.rst

    minor editing

commit e5a1e6c2a263a1bf9484b71ad0b66650c5aa7759
Author: Ankushi Sharma <anksharm@gwmail.gwu.edu>
Date:   Tue May 27 10:51:25 2014 -0400

    made changes for a few Typo

commit aa619faafb425966cc5a43c6776d3849a4700072
Author: kerchner <kerchner@gwu.edu>
Date:   Fri May 23 15:25:32 2014 -0400

    Removed troubleshooting from FQA and placed contents into troubleshooting.rst

commit 990596783071b22b9b8d2846832d61a0f477657d
Author: kerchner <kerchner@gwu.edu>
Date:   Fri May 23 15:25:08 2014 -0400

    Broke out troubleshooting as a separate file

commit 8a9c27b6a527a65800f820e61c55471fca89efd4
Author: kerchner <kerchner@gwu.edu>
Date:   Fri May 23 15:08:22 2014 -0400

    Rearrange and clean up. Fixes #188

commit 791bd4f95ea9283e9cfabf1be2669bdf20981073
Author: Dan Kerchner <kerchner@gwu.edu>
Date:   Fri May 23 14:46:19 2014 -0400

    I will get this right eventually

commit f823e6dbc70cd8857968e3aa3c58668c0d143d81
Author: Dan Kerchner <kerchner@gwu.edu>
Date:   Fri May 23 14:43:47 2014 -0400

    yet another name correction

commit 293a817159ba880421db17db9d1ff5f1d968c633
Author: Dan Kerchner <kerchner@gwu.edu>
Date:   Fri May 23 14:42:23 2014 -0400

    Corrected twitter account for ankushi

    Hopefully this will spare Ankur Sharma unwanted fame and fortune.

commit 3208846d20790e178bc76bf7ee9469663312738b
Author: Dan Kerchner <kerchner@gwu.edu>
Date:   Fri May 23 14:40:54 2014 -0400

    Added Ankushi to devs list

commit 1ce3367d51ee150245d6919170ee25cea3eb5668
Merge: cf8b48f e940771
Author: Dan Kerchner <kerchner@gwu.edu>
Date:   Fri May 23 14:35:10 2014 -0400

    Merge pull request #206 from gwu-libraries/t180-doc-introduction

    T180 doc introduction

commit e940771f31c9997381914c34372180705a140f44
Author: kerchner <kerchner@gwu.edu>
Date:   Fri May 23 14:34:33 2014 -0400

    Made twitter user references on contact us into hyperlinks

commit 9e1d523f65ed9e77991cd481cde7fd4e3e740eaf
Author: kerchner <kerchner@gwu.edu>
Date:   Fri May 23 11:43:20 2014 -0400

    Added link to Arie Nugraha's blog post

commit 0def6c46df0e6b1be8cd3cc02f3158232b0bedbd
Author: kerchner <kerchner@gwu.edu>
Date:   Fri May 23 09:57:11 2014 -0400

    Added exception handing to swallow exceptions in the following cases: adding a process that's already added; removing a process that is already stopped or isn't a known process

commit 3dd87efb5b8dbfbfcb1312c82a10ffd4ee238bd5
Author: kerchner <kerchner@gwu.edu>
Date:   Thu May 22 14:58:20 2014 -0400

    Added sleep after create conf file, added reload_config before adding process group

commit e77be0f5b999dfbef698002b2c2f539d66bed864
Author: kerchner <kerchner@gwu.edu>
Date:   Thu May 22 14:57:52 2014 -0400

    Added reload config, renamed filename to processname.  Added sleep between stop and remove

commit 953ec4d516aefe01312a8d63f06c3b2b80c6ee9d
Author: Laura Wrubel <lwrubel@gwu.edu>
Date:   Thu May 22 08:33:05 2014 -0400

    added Overview heading, contact us information

commit 054ef7aa3d6122e0e3847d8c45830b0967863039
Author: Ankushi Sharma <anksharm@gwmail.gwu.edu>
Date:   Wed May 21 16:48:35 2014 -0400

    draft for release notes/changes doc

commit a690c3ad2bd86f3b4991383cb07de59618bd6756
Author: kerchner <kerchner@gwu.edu>
Date:   Wed May 21 00:42:51 2014 -0400

    utils.py

commit 82aa80a8c71e2701dff74491ca54a23fa9e85d47
Author: kerchner <kerchner@gwu.edu>
Date:   Wed May 21 00:41:59 2014 -0400

    Moved code to write a single twitterfilter supervisor process config file, to a utils.py method

commit c3f5e205c63fc763c2cbd4003c6d349381ef7d71
Author: kerchner <kerchner@gwu.edu>
Date:   Tue May 20 20:32:50 2014 -0400

    cosmetic

commit 64e03443a0976bcaabc2b80d61fc627e32133371
Author: kerchner <kerchner@gwu.edu>
Date:   Tue May 20 20:27:11 2014 -0400

    Added back change from #158

commit 8f9329e00ac764b975ab1ee84f524a0c20fca8ca
Author: kerchner <kerchner@gwu.edu>
Date:   Tue May 20 20:25:32 2014 -0400

    Added add_process_group, remove_process_group, and calls to these methods from models.py when activating or deactivating a twitterfilter.  Fixes #154

commit ffae3c120edb63c549dcb21cecd97d3cd8f7ce7e
Author: kerchner <kerchner@gwu.edu>
Date:   Tue May 20 20:25:03 2014 -0400

    Added supervisor - needed for supervisor xmlrpc calls

commit 6c6f962c6ce5909046a7b7bd77f61130bf509b40
Author: kerchner <kerchner@gwu.edu>
Date:   Tue May 20 20:24:42 2014 -0400

    Added SUPERVISOR_UNIX_SOCKET_FILE

commit 1dfb05ac1fbb754b9cf74b16bd45c088da00f80d
Author: kerchner <kerchner@gwu.edu>
Date:   Thu May 15 21:53:45 2014 -0400

    deprecated populate_uids... may remove it

commit 3d5e365320e7d52442b3f6287b2e909e384c49df
Author: kerchner <kerchner@gwu.edu>
Date:   Wed May 14 17:58:36 2014 -0400

    Updated update_usernames

commit 25877950b34df7bd72698be2ded61dcf4b628202
Author: kerchner <kerchner@gwu.edu>
Date:   Wed May 14 16:57:38 2014 -0400

    Added back sample output (inadvertently removed)

commit 6e6738b43869f00a618dc68afeab0025460c957b
Author: kerchner <kerchner@gwu.edu>
Date:   Wed May 14 16:54:58 2014 -0400

    Part way through editing for flow.  To be continued.

commit 59d87ebcf7880aedab3dc37857f7d3c221d2ff1c
Author: Ankushi Sharma <anksharm@gwmail.gwu.edu>
Date:   Wed May 14 13:08:16 2014 -0400

    hyperlink changes, and output screenshot added

commit bd189b2dd63b3aa42c8b2ecffc2a2c2223792abc
Author: kerchner <kerchner@gwu.edu>
Date:   Wed May 14 12:00:52 2014 -0400

    Fixed underlining for one of the faqs

commit 823f589d2fd30da4acc3bed9088145d7a01ed673
Author: kerchner <kerchner@gwu.edu>
Date:   Wed May 14 11:55:36 2014 -0400

    Added many FAQs and troubleshooting items.  Fixes #188

commit ae002bcb170b5f68c8de717cdb0440a2b066d551
Author: Ankushi Sharma <anksharm@gwmail.gwu.edu>
Date:   Tue May 13 18:11:45 2014 -0400

     updated hyperlinks, need to add output screenshots

commit 812d879902a2c6959ac6ca463cfd5b55fbaf1bad
Author: kerchner <kerchner@gwu.edu>
Date:   Tue May 13 16:30:54 2014 -0400

    Fixes #193

commit 86e841af2bd6ba84b4a9d3c27af21db18acda591
Author: kerchner <kerchner@gwu.edu>
Date:   Tue May 13 16:27:56 2014 -0400

    completed remaining items in state transitions

commit 35893142faa0a138d80b3c4cff2977217b7def90
Author: Ankushi Sharma <anksharm@gwmail.gwu.edu>
Date:   Tue May 13 10:09:54 2014 -0400

    changes for the hyperlinks

commit d15344627ee6f665004539b96fed27af6687e11d
Author: Laura Wrubel <lwrubel@gwu.edu>
Date:   Mon May 12 15:44:28 2014 -0400

    Re-ordered sections and formatted footnote. Fixes #180

commit 1c958e8c19fb10592372587a7d147ce5bb106f56
Author: kerchner <kerchner@gwu.edu>
Date:   Mon May 12 15:42:29 2014 -0400

    Added definitions for TwitterUser states, and started draft of implications of deleting a TwitterUser

commit eb30dd683aed15b8040af0303ed7786d7dfbc5fc
Author: Ankushi Sharma <anksharm@gwmail.gwu.edu>
Date:   Mon May 12 14:58:21 2014 -0400

    management command write up for Docs release

commit a0a14b30bf0cf597c957294c846344ce975409d2
Author: kerchner <kerchner@gwu.edu>
Date:   Thu May 8 19:40:47 2014 -0400

    Added more cases

commit fbe46b8b8146b8557e5025040809d9b0d11224f3
Author: kerchner <kerchner@gwu.edu>
Date:   Thu May 8 19:06:45 2014 -0400

    added missing word

commit 782e726c925bb38cd69eeac0343e4809adb43d3e
Author: kerchner <kerchner@gwu.edu>
Date:   Thu May 8 19:05:10 2014 -0400

    Updated use_cases to deal with name changing situations

commit 060b11951dba838bb727dc3f2b162f984c5c7b8c
Author: Laura Wrubel <lwrubel@gwu.edu>
Date:   Tue May 6 08:21:04 2014 -0400

    incorporated Ivey's suggestions

commit c0d6e3d087530413288ba35484d654f871e5193a
Author: kerchner <kerchner@gwu.edu>
Date:   Mon May 5 17:13:52 2014 -0400

    Initial pre-draft

commit 89e558347d042a5a3605a89d4baa7c33e5e46d35
Author: kerchner <kerchner@gwu.edu>
Date:   Mon May 5 17:01:18 2014 -0400

    Added detail to State Transitions

commit 4980e3fbae24c5e4e3c387f2f1f7adfff342902b
Author: kerchner <kerchner@gwu.edu>
Date:   Mon May 5 16:35:58 2014 -0400

    In-process draft

commit a5571891a64407e77dea815ab032e6b4bacda56e
Author: Laura Wrubel <lwrubel@gwu.edu>
Date:   Mon May 5 16:30:56 2014 -0400

    introduction first draft

commit 6af3f3c7af0337bafa24caf6806f7ef213a7fbf8
Merge: 8c9c6fd ffeb02b
Author: Dan Kerchner <kerchner@gwu.edu>
Date:   Thu May 1 16:55:01 2014 -0400

    Merge pull request #161 from gwu-libraries/t89-republish-tweets-new

    T89 republish tweets new

commit 8c9c6fdba75d7c29b37b8d84124ff6378df90187
Merge: 8e77d86 8c7f7ee
Author: Dan Kerchner <kerchner@gwu.edu>
Date:   Thu May 1 16:52:47 2014 -0400

    Merge pull request #204 from gwu-libraries/t160-pythonioencoding-new

    T160 pythonioencoding new

commit 8c7f7eea8dfa22c6b474ad3d8d8577490005d892
Author: kerchner <kerchner@gwu.edu>
Date:   Thu May 1 16:51:21 2014 -0400

    redoing commit 06a4041bc180a92f30c45c7343d941bf40a50ef1 in a fresh branch

commit f642eff8d598ee4175396fd7711b46ae6c448ea5
Merge: 8e77d86 4f495f6
Author: kerchner <kerchner@gwu.edu>
Date:   Thu May 1 16:03:16 2014 -0400

    Merge tag 'm4_001' of github.com:gwu-libraries/social-feed-manager

    tagging m4_001

commit ede67b8bae4045a98d7f53c143c9add5e1d20a4e
Merge: baf532a 8e77d86
Author: Daniel Chudnov <dchud@gwu.edu>
Date:   Thu May 1 07:05:13 2014 -0400

    Merge branch 'master' of github.com:gwu-libraries/social-feed-manager

commit 8e77d86e8cdb27c29f3e779cfc934b80688da50e
Merge: 70237e4 f7a568a
Author: Dan Chudnov <dchud@umich.edu>
Date:   Thu May 1 07:04:10 2014 -0400

    Merge pull request #159 from gwu-libraries/t158-username-case

    Added __iexact to make match case-insensitive, to accommodate different ...

commit baf532aaf22b48b2637642c6db41147476f19d15
Merge: 4f495f6 70237e4
Author: Daniel Chudnov <dchud@gwu.edu>
Date:   Wed Apr 30 22:11:08 2014 -0400

    Merge branch 'master' of github.com:gwu-libraries/social-feed-manager

commit cf8b48fc6b25d6fb90d88fdcc3e5c35818058aa7
Author: kerchner <kerchner@gwu.edu>
Date:   Tue Apr 29 15:27:46 2014 -0400

    Initial commit

commit 457f8c03439444a943e5cbc3370c48896fcd99d0
Author: kerchner <kerchner@gwu.edu>
Date:   Tue Apr 29 15:25:25 2014 -0400

    Fixed link to github repo

commit c4e5a77b6990f14ae4af300fe89d38da8db162b9
Author: kerchner <kerchner@gwu.edu>
Date:   Tue Apr 29 14:31:16 2014 -0400

    Added stub files for major sections

commit e007eefd4892fbb291f926b58e715b0847014310
Author: kerchner <kerchner@gwu.edu>
Date:   Tue Apr 29 14:17:05 2014 -0400

    Roughed out table of contents; added intro file to test TOC introspecting 2 levels down

commit eff023c34aa8e4737ae21ddc74c3c578a2203a30
Merge: 4e84331 412fd49
Author: kerchner <kerchner@gwu.edu>
Date:   Mon Apr 28 17:14:20 2014 -0400

    Merge branch 't189-readthedocs' of github.com:gwu-libraries/social-feed-manager into t189-readthedocs

commit 4e8433138b49523a91193782af7b688c8cce4dc4
Merge: ba52563 70237e4
Author: kerchner <kerchner@gwu.edu>
Date:   Mon Apr 28 17:12:10 2014 -0400

    Merge branch 'master' of github.com:gwu-libraries/social-feed-manager into t189-readthedocs

commit ba525633bfb16255803e50e9adac7153d0b45f8f
Author: kerchner <kerchner@gwu.edu>
Date:   Mon Apr 28 17:08:53 2014 -0400

    Added reference to FAQ doc

commit 412fd49e4633c08cf25eada2a7a679030ded35b6
Author: Dan Kerchner <kerchner@gwu.edu>
Date:   Mon Apr 28 17:08:31 2014 -0400

    Create faq.rst

commit 589fdc673f3e42f8617c87548f7091a454c72c9f
Author: kerchner <kerchner@gwu.edu>
Date:   Mon Apr 28 14:25:55 2014 -0400

    Initial commit.

commit 70237e484cef883a719c802965e502d0171d6b18
Author: Dan Chudnov <dchud@umich.edu>
Date:   Mon Apr 28 12:59:38 2014 -0400

    fixed mistaken help text

commit 4f495f68012c128e7b87f5a6a85223ce0d7a18ba
Merge: 92760ba 6894cf0
Author: Daniel Chudnov <dchud@gwu.edu>
Date:   Mon Apr 28 10:52:25 2014 -0400

    Merge branch 'master' of github.com:gwu-libraries/social-feed-manager

commit 6894cf09c5c9bf5c6bbcb2bd4ff087da9fe554ab
Merge: 386d62d 1157943
Author: Dan Chudnov <dchud@umich.edu>
Date:   Mon Apr 28 10:51:33 2014 -0400

    Merge pull request #152 from gwu-libraries/t150-skip-validation-for-inactive

    Added logic to throw clean ValidationErrors if name is not unique, but s...

commit 92760ba0fa6ac0024b60fbb83f162bb12b8ace01
Merge: 4f5f1d1 386d62d
Author: Daniel Chudnov <dchud@gwu.edu>
Date:   Tue Apr 22 13:56:56 2014 -0400

    Merge branch 'master' of github.com:gwu-libraries/social-feed-manager

commit 115794395a7e9f3f4bbe311d81caa83deda2f837
Author: kerchner <kerchner@gwu.edu>
Date:   Thu Apr 17 13:16:58 2014 -0400

    Corrected dups.exclude to dups = dups.exclude, in order to actually modify dups and successfully exclude "self" from uplicate checks.

commit b567f786c5a5c7b40843e81e93e3e3617ceab370
Merge: 7cdacb0 386d62d
Author: kerchner <kerchner@gwu.edu>
Date:   Thu Apr 17 13:03:40 2014 -0400

    merged conflicts between master and t150-skip-validation-for-inactive

commit 386d62d4d2d5914931463a8b0361238b34323e93
Merge: e268745 66ade13
Author: Dan Kerchner <kerchner@gwu.edu>
Date:   Thu Apr 17 12:10:02 2014 -0400

    Merge pull request #176 from gwu-libraries/t148-duplicate-timeline-errors

    removed doubling of user timeline errors by being a little more conserva...

commit 4f5f1d149a48c324e1cfa86058eac9dc156ecee6
Merge: 6be00a4 e268745
Author: Daniel Chudnov <dchud@gwu.edu>
Date:   Wed Apr 16 19:01:37 2014 -0400

    Merge branch 'master' of github.com:gwu-libraries/social-feed-manager

commit e268745e19533f050e438a7c90ba3ea76f84f272
Merge: 9a7d3ac 1382d93
Author: Dan Chudnov <dchud@umich.edu>
Date:   Wed Apr 16 18:57:02 2014 -0400

    Merge pull request #179 from gwu-libraries/t177-filter-signal-bug

    twitterfilter signal changes

commit 6be00a4a68c0baf1ce85cf4cb3f9a98e436cdca0
Merge: 6aac96f 9a7d3ac
Author: Daniel Chudnov <dchud@gwu.edu>
Date:   Wed Apr 16 18:55:13 2014 -0400

    Merge branch 'master' of github.com:gwu-libraries/social-feed-manager

commit 1382d9363f1c4a42836bfcd9c708dd17fcc14069
Author: Ankushi Sharma <anksharm@gwmail.gwu.edu>
Date:   Wed Apr 16 14:54:32 2014 -0400

    changes in models.py to send signals for particular filterid, in utils to follow twitterfilter usage

commit 66ade13bd486c1fd4927c782a3599baca6e6b032
Author: Dan Chudnov <dchud@gwu.edu>
Date:   Mon Apr 14 18:59:03 2014 +0000

    removed doubling of user timeline errors by being a little more conservative, fixes #148

commit 9a7d3ac58b7411aa203fef8e40a76bf81d4ec92c
Merge: 37aa638 7312b66
Author: Dan Chudnov <dchud@gwu.edu>
Date:   Mon Apr 14 18:12:26 2014 +0000

    resolving conflicts, still from merging master

commit 37aa638aa836448b276cd9a2816dc149fb33dc45
Merge: 058a9e1 5193404
Author: Dan Chudnov <dchud@gwu.edu>
Date:   Mon Apr 14 18:09:34 2014 +0000

    resolved conflicts from merge master

commit 058a9e168c8f8fbf506983a385c849369cc82203
Author: Dan Chudnov <dchud@gwu.edu>
Date:   Mon Apr 14 17:31:26 2014 +0000

    more formatting tweaks in README, refs #168

commit b3a02ab9ca7191236951f7ba27665f0298ccc4f6
Author: Dan Chudnov <dchud@gwu.edu>
Date:   Mon Apr 14 17:10:59 2014 +0000

    tweaked some wording and formatting in README, refs #168

commit ea05c699f766be4f9c807186ecfcb7b328b704a5
Author: Dan Kerchner <kerchner@gwu.edu>
Date:   Fri Apr 11 10:23:47 2014 -0400

    Clarified instructions about supervisor [include]

    fixes #168

commit ccb9edc8685fc414b17428e3d168c7d3fedfdbb9
Author: Dan Kerchner <kerchner@gwu.edu>
Date:   Fri Apr 11 10:10:40 2014 -0400

    Added instructions for placing supervisor.d dir in new sfm group

    Fixes #168

commit 6a5bc3639d5109f42175be676dba631314baed68
Author: kerchner <kerchner@gwu.edu>
Date:   Fri Apr 11 09:48:36 2014 -0400

    Unified all TwitterFilter process and file naming to twitterfilter-n; changed streamsample file naming to match as "streamsample"; updated organizedata to accommodate this naming; updated supervisor config file generation to write to /var/log/sfm
    .  Fixes #170

commit 1658fea80ad3dfd932ca720d26456632c4e70c0b
Author: Dan Chudnov <dchud@gwu.edu>
Date:   Thu Apr 10 21:27:18 2014 +0000

    cleaned up filterstream to remove legacy "one big filter" logic, tightened up args/options, closes #174; cleaned up createconf to match, refs #170

commit c66ed705113d5f3896b69fd4a693fd92859b3da2
Merge: ea39c68 b27ae95
Author: Dan Chudnov <dchud@gwu.edu>
Date:   Thu Apr 10 20:58:26 2014 +0000

    Merge branch 't130-generate-process-conf' of https://github.com/gwu-libraries/social-feed-manager into t130-generate-process-conf

commit b27ae954cd2ad9a6e6d70a75c0b4256df12196ae
Author: kerchner <kerchner@gwu.edu>
Date:   Thu Apr 10 16:24:55 2014 -0400

    removed extraneous commented-out line

commit a6073285b650d63300d47e7de50dc01d55c67eae
Author: kerchner <kerchner@gwu.edu>
Date:   Thu Apr 10 16:24:04 2014 -0400

    added comment to clarify SFM_ROOT

commit 558aed787b040fbc973b127030c4ba1952f5d78f
Author: kerchner <kerchner@gwu.edu>
Date:   Thu Apr 10 16:22:27 2014 -0400

    Supervisor config files are now written to invoke SFM management commands without needing a PATH.  Also centralized detection of SFM_ROOT into a settings variable (in settings rather than local_settings, as there should be no reason to change this). Fixes #167

commit ba0f628846619edab026ca1513e0a3537032227f
Author: kerchner <kerchner@gwu.edu>
Date:   Thu Apr 10 16:20:02 2014 -0400

    further updates to reflect rename of supervisor-sfm-conf to sfm/sfm/supervisor.d

commit 647c101d66e9b3cbf2f0ab42be4dc370205f40da
Author: kerchner <kerchner@gwu.edu>
Date:   Thu Apr 10 15:33:23 2014 -0400

    updated path/location of supervisor.d folder in readme

commit ea39c6865a17204a493b443cedf77e5654c40fd8
Author: Dan Chudnov <dchud@gwu.edu>
Date:   Thu Apr 10 18:58:28 2014 +0000

    added user to TwitterFilterAdmin, refs #174

commit d1c5ff4142a1b691dfe5cace41f7d7d12f1b12b8
Author: Dan Chudnov <dchud@gwu.edu>
Date:   Thu Apr 10 18:55:49 2014 +0000

    updated TwitterFilter help text to state "space-separated", not comma-, refs #174

commit 279bef97467d6c53182e636dafa3c8962acc5a76
Author: Dan Chudnov <dchud@gwu.edu>
Date:   Thu Apr 10 18:52:15 2014 +0000

    switched filterstream user to associated twitter_filter.user, refs #174

commit 8d35ef0e17ac8a5270edf35923478c41106ae0b6
Author: kerchner <kerchner@gwu.edu>
Date:   Thu Apr 10 14:17:05 2014 -0400

    Renamed supervisor-sfm-conf to supervisor.d, updated dependencies, added sfm/sfm/supervisor.d/*.conf to .gitignore.  Fixes #166

commit 71b4e6568321152a8fa1263ac34bdbd6b186a714
Author: kerchner <kerchner@gwu.edu>
Date:   Thu Apr 10 12:19:34 2014 -0400

    Streamlined help text wording, removed "command to"

commit 7312b660a9b49fd46bfd63ed2d747a4b15690c7f
Merge: 5193404 19cd8d8
Author: Dan Kerchner <kerchner@gwu.edu>
Date:   Thu Apr 10 11:57:29 2014 -0400

    Merge pull request #162 from gwu-libraries/t119-expand-urls

    added url expansion post-proccessing command "fetch_urls", closes #119; ...

commit a701269fa3df6978c25b2d264c034f2b74e37815
Author: kerchner <kerchner@gwu.edu>
Date:   Thu Apr 10 10:06:55 2014 -0400

    Removed SFM_LOCATION dependency, substituted with os.path autodetect

commit 6aac96f3e8f61ca5101e833e29ead783f7ee6692
Merge: 29e59be 5193404
Author: Daniel Chudnov <dchud@gwu.edu>
Date:   Wed Apr 9 16:25:09 2014 -0400

    Merge branch 'master' of github.com:gwu-libraries/social-feed-manager

commit 3aa3a91c60418993931706c280881abd004cfa25
Author: kerchner <kerchner@gwu.edu>
Date:   Wed Apr 9 15:01:11 2014 -0400

    Added autodiscovery of user who is the process owner; createconf will specify this user in the supervisord config files if none is specified in settings.

commit 33dd5a0755ea35795200f2bdff10212e8394188c
Author: kerchner <kerchner@gwu.edu>
Date:   Wed Apr 9 14:43:38 2014 -0400

    Now automatically finds project root; removed SFM_LOCATION from settings. Also relocated supervisor-sfm-conf down to inside sfm/sfm

commit ffeb02be76ce563b525512e544ff0eaa8cf59799
Author: kerchner <kerchner@gwu.edu>
Date:   Wed Apr 9 14:13:23 2014 -0400

    changed outfile and logfile to overwrite, not append; changed options.get() to options[]; streamlined error message output

commit 5193404063d81b02b159f616bb4807e0ae24513c
Author: Dan Kerchner <kerchner@gwu.edu>
Date:   Wed Apr 9 13:02:38 2014 -0400

    Corrected SAVE_INTERVAL_SECONDS (was SAVE_INTERVAL_SETTINGS)

commit 7d062d5b1931c3d125c7a4f0e74e2e0ae7b9fcc0
Author: kerchner <kerchner@gwu.edu>
Date:   Wed Apr 9 12:46:27 2014 -0400

    Removed extraneous line, this time for real

commit d08923f9ec79d0cf9fe22140189edb4eee372fd4
Author: kerchner <kerchner@gwu.edu>
Date:   Wed Apr 9 12:45:44 2014 -0400

    Removed extraneous line

commit 9d86e97807f5b7c177531e58b425aff7e41759ee
Author: kerchner <kerchner@gwu.edu>
Date:   Wed Apr 9 12:14:40 2014 -0400

    Removed sample-input.txt from repo

commit 4143c4d8ee21c10ef348709c028bde990ce882b8
Author: kerchner <kerchner@gwu.edu>
Date:   Wed Apr 9 12:13:30 2014 -0400

    removed logfile name dependency on outfile, which may not always be specified. There will always be an infile, so append .log to infile name

commit 7cdacb0c4c6303eddb63e56cd9676442b89c9c47
Author: kerchner <kerchner@gwu.edu>
Date:   Wed Apr 9 12:03:25 2014 -0400

    formatting tweak

commit 3ddeda43587de813cfe8bcf101bd16b617852b0c
Author: kerchner <kerchner@gwu.edu>
Date:   Wed Apr 9 12:02:12 2014 -0400

    removed 0025_auto__chg_field_twitteruser_uid.py

commit 89cafb775463848b9c0c76c190568c8dd79fc844
Author: kerchner <kerchner@gwu.edu>
Date:   Wed Apr 9 10:23:04 2014 -0400

    Removed TwitterUser.uid constraints blank=True,null=True; modified clean() logic to only validate for new TwitterUser (whether active or not) or for updating existing TwitterUser w/is_active=True. Allow duplicate names, but catch duplicate uid here.

commit 19cd8d8a2275d5a7036e6f66476d65ddaf7a5476
Author: Daniel Chudnov <dchud@gwu.edu>
Date:   Wed Apr 9 08:22:16 2014 -0400

    renamed duration_microseconds to duration_seconds to be accurate, refs #119

commit 5ae07a48297cadc5999a700715c0b0b3035a550a
Author: kerchner <kerchner@gwu.edu>
Date:   Tue Apr 8 16:04:41 2014 -0400

    Changed command name to fetch_tweets_by_id; modified help text; added message when no inputfile specified; multiple changes to streamline logic

commit 969378a6e430e10ee361a69796f3b8c767b231f5
Author: Daniel Chudnov <dchud@gwu.edu>
Date:   Tue Apr 8 11:38:03 2014 -0400

    added url expansion post-proccessing command "fetch_urls", closes #119; moved make_date_aware out of export_csv into utils

commit d6606ac3f44894e97de25f719dfd7364e4324ef3
Author: Ankushi Sharma <anksharm@gwmail.gwu.edu>
Date:   Mon Apr 7 15:41:30 2014 -0400

    renamed the test sample input file

commit b51277b15a19ad2763c42276bee7686e3db772c6
Author: Ankushi Sharma <anksharm@gwmail.gwu.edu>
Date:   Mon Apr 7 14:56:02 2014 -0400

    sample input file, and changed republish tweet for infile,outfile & logfile changes

commit 7ce352d74d44ebe3a08ad472d73bf78cd2a725d7
Merge: 68aa655 29e59be
Author: Ankushi Sharma <anksharm@gwmail.gwu.edu>
Date:   Mon Apr 7 14:17:41 2014 -0400

    Merge branch 'master' of github.com:gwu-libraries/social-feed-manager

commit 29e59be6c525cae55bd1ec52098e0db5d1f0a087
Author: Dan Kerchner <kerchner@gwu.edu>
Date:   Thu Apr 3 17:55:14 2014 -0400

    Updated Rule to TwitterFilter

commit 3fbd30d9fe74d056be765d013e73ac71b9d6d6d2
Merge: c46faa0 3ea60c1
Author: Dan Kerchner <kerchner@gwu.edu>
Date:   Tue Apr 1 16:53:12 2014 -0400

    Merge pull request #156 from escowles/master

    Adding note to README to avoid admin/twitter username conflict

commit f7a568a7f6b4d5a774d78b5aac1c6fdcfec99913
Author: kerchner <kerchner@gwu.edu>
Date:   Mon Mar 31 18:12:05 2014 -0400

    Added __iexact to make match case-insensitive, to accommodate different capitalization of username in TWITTER_DEFAULT_USERNAME.  Fixes #158

commit c46faa0b1e6ea10fc5b8c9b1ea847a301b9beef2
Author: Dan Kerchner <kerchner@gwu.edu>
Date:   Mon Mar 31 14:05:45 2014 -0400

    In postgres setup, fixed markup of comments vs. code snippets

commit 3ea60c12eec7d73bb35af9c0fa6ca1a019fc6147
Author: Esmé Cowles <escowles@ucsd.edu>
Date:   Mon Mar 24 11:52:38 2014 -0400

    Adding note to README to avoid admin/twitter username conflict

commit 867b61159b4474e83f12b4166316a923620fa67e
Author: kerchner <kerchner@gwu.edu>
Date:   Fri Mar 21 09:50:00 2014 -0400

    Fixed error in comment over SFM_LOCATION

commit ef8798c6f4132e6a9e5b7149401a1fda5812362f
Author: kerchner <kerchner@gwu.edu>
Date:   Thu Mar 20 18:56:53 2014 -0400

    fixed typo

commit 311e01bcf21e9632c2165a71f5b95a4b5f0a85ba
Author: kerchner <kerchner@gwu.edu>
Date:   Thu Mar 20 18:54:59 2014 -0400

    Added significant content to README around supervisor management of filterstream processes, the need to run createconf, and caveat about needing to manually kick supervisor to update.

commit bfde0a0555fdcbb28909c2a973043dbc068d3261
Author: kerchner <kerchner@gwu.edu>
Date:   Thu Mar 20 17:41:36 2014 -0400

    Simplified logic for updating (deleting+recreating) existing filterstream conf file; added console output; added comments; Updated help text; updated manage.py location relative to SFM_LOCATION; changed variable name from filtered to tfilter; removed extraneous /bin from env path; updated log file path, names; eliminated use of FILEPATH (in favor of SFM_LOCATION).

commit 3397a31161e5b14a23ce4557bae0d6a532eb9df1
Author: kerchner <kerchner@gwu.edu>
Date:   Thu Mar 20 17:23:45 2014 -0400

    Rewrote TwitterFilter clean() validation logic (and wording): no validation if is_active==False; else: check for username conflicts with 1) TWITTER_DEFAULT_USERNAME (used for streamsample) and 2) any other active filters. Fixes #130 first requirement bullet.

commit d92408e778a8ccc1a60bef84393eeeb0baaf6cec
Author: kerchner <kerchner@gwu.edu>
Date:   Thu Mar 20 17:20:53 2014 -0400

    Updated file_path in delete_conf_file to reflect new location for conf files in /supervisor-sfm-conf and new settings variable SFM_LOCATION

commit 4c9a814fd6630e5cd7056cb67575a0bdf9ba7449
Author: kerchner <kerchner@gwu.edu>
Date:   Thu Mar 20 17:14:46 2014 -0400

    added sfm- prefix to streamsample log file names

commit 38de9729ec59b0bc5c883d76d82446a017a57536
Author: kerchner <kerchner@gwu.edu>
Date:   Wed Mar 19 17:11:52 2014 -0400

    Eliminated FILEPATH (obselete) and clarified comments around the other supervisord-related settings

commit 010cf6333c2926909df6a9b25943a4153b8590e0
Merge: bff6c57 1ee6124
Author: Ankushi Sharma <anksharm@gwmail.gwu.edu>
Date:   Wed Mar 19 16:10:51 2014 -0400

    Merge branch 't130-generate-process-conf' of github.com:gwu-libraries/social-feed-manager into t130-generate-process-conf

    Conflicts:
    	sfm/ui/management/commands/createconf.py

commit fb1643ab004fb62ddaeff72c799e1e177d770e84
Author: kerchner <kerchner@gwu.edu>
Date:   Wed Mar 19 15:56:20 2014 -0400

    Added logic to throw clean ValidationErrors if name is not unique, but skip the rest as long as is_active==False - fixes #150. In the case where is_active==True, added smarter ValidationErrors to distinguish between bad API credential errors versus case where account name is not found in Twitter.

commit 1ee61240219946555e0f94d712e0df23b22c5d9a
Author: kerchner <kerchner@gwu.edu>
Date:   Wed Mar 19 12:27:00 2014 -0400

    Moved streamsample.conf to streamsample.conf.template to ensure that streamsample.conf is deliberately copied and edited before being picked up by supervisor.  Updated README accordingly.

commit d56b1a170f64df4960ef0ab3bdc46767041d6523
Author: kerchner <kerchner@gwu.edu>
Date:   Wed Mar 19 08:56:26 2014 -0400

    Added fields list to TwitterFilterAdmin to cause name to display before user

commit 5facd84b407671df77cead34da215cfdfae77365
Author: kerchner <kerchner@gwu.edu>
Date:   Mon Mar 17 20:42:11 2014 -0400

    Added logic to chmod +x on newly created conf files.  Also added file.close().  Supports #149.

commit 5c703c2e9701752b2b29ee31647fb7a90f797d4b
Author: kerchner <kerchner@gwu.edu>
Date:   Mon Mar 17 20:07:27 2014 -0400

    Created supervisor-sfm-conf directory, moved streamsample.conf to it; updated README.  Fixes #149.

commit 4a1e35caf47de96ac13edb1783bdfb70b0735f88
Merge: 92086e8 b9966c0
Author: anksharm <anksharm@email.gwu.edu>
Date:   Fri Mar 14 12:27:58 2014 -0400

    Merge pull request #147 from gwu-libraries/t145-twitterfilter-name

    T145 twitterfilter name

commit b9966c0e29dbea4046cb95787ce9e304e5318946
Author: kerchner <kerchner@gwu.edu>
Date:   Fri Mar 14 11:33:30 2014 -0400

    Switched order of words and people in TwitterFilter to improve display order in admin view

commit e3a552150389aaad6da0b277ca5878bcf6c159a8
Author: kerchner <kerchner@gwu.edu>
Date:   Fri Mar 14 11:33:03 2014 -0400

    Added name, locations to search fields

commit 92086e8391b5b840fe507d9d9674db053ced10d5
Author: Dan Chudnov <dchud@umich.edu>
Date:   Mon Mar 10 15:26:02 2014 -0400

    updated date range in LICENSE.txt

commit 68aa65560485bd696314b719de16f85a8d597893
Author: kerchner <kerchner@gwu.edu>
Date:   Tue Mar 4 13:23:44 2014 -0500

    Switched order of user and name so that name would appear first in admin view. Also added help text to these two fields.

commit f38b70eab5a20404318c54846e175da646ca561e
Author: kerchner <kerchner@gwu.edu>
Date:   Tue Mar 4 13:22:51 2014 -0500

    Added name and user columns to admin list view.  Fixes #145.

commit bf926ec94f1ff4808364009d1323405ada044705
Author: kerchner <kerchner@gwu.edu>
Date:   Tue Mar 4 13:23:44 2014 -0500

    Switched order of user and name so that name would appear first in admin view. Also added help text to these two fields.

commit 6757c449e4e60757e36287ce2ba131c560532fc0
Author: kerchner <kerchner@gwu.edu>
Date:   Tue Mar 4 13:22:51 2014 -0500

    Added name and user columns to admin list view.  Fixes #145.