remove aws for now
more random plugins
remove corgi and add stock
updating jarvis
Merge remote-tracking branch 'heroku/master'