Merge pull request #46 from udacity/development

Merge development
Merge pull request #49 from udacity/development

Merge development
Merge pull request #51 from udacity/development

Merge development
Merge pull request #53 from udacity/development

Merge development
Merge pull request #55 from udacity/development

Merge development
Use correct email for users
Merge pull request #56 from cdman/development

Use correct email for users