Working on start of uploader button directive
Merge branch 'master' of github.com:rickcarlino/OpenFarm
tooling around with uploader directive
Ironing out some issues with directive dependencies
Merge branch 'master' of github.com:FarmBot/OpenFarm
Gemfile changes
More changes.
Switchover to coffee again
Very close
Mostly done, I think
WHitespace tweaks
Cleanup
Pulled description, title, and keywords out of templates and into i18n
Merge pull request #275 from rickcarlino/master

Better uploader directive
Merge pull request #276 from simonv3/master

Pulled description, title, and keywords out of templates and into i18n
merge conflict