Merge pull request #125 from rickcarlino/master

S3 Uploads Angular directives + ENV vars for S3
Fixed some asset pipeline issues
Minor tweaks for simon to look at
Merge branch 'master' of github.com:FarmBot/OpenFarm