Merge pull request #66 from deluda/master

Updated datasource for AWS connection
Some Edits
Merge pull request #67 from kguischard13/master

Some Edits
A minor edit
Merge pull request #68 from kguischard13/master

A minor edit
Merge pull request #19 from Caf131/master

Updates