Merge pull request #39 from kparlante/master

Merge the convict PR
Merge pull request #41 from kparlante/master

Pulling the awsbox and couch install changes so @karlht can use them
Merge pull request #42 from kparlante/master

Fix for "new user flow over time" graph
Merge pull request #43 from kparlante/master

Ignore 'canceled' flows that aren't new users
Merge pull request #54 from kparlante/master

Implements the new_user view changes