logging system
merge
don't allow the dev buttons in production regardless
Merge branch 'master' of https://github.com/artsy/eidolon into location
switch logo / register
Merge pull request #207 from orta/location

@1aurabrown => in-app logging system
Merge pull request #201 from AshFurrow/conditions

@1aurabrown => Conditions Of Sale
Merge branch 'master' of github.com:artsy/eidolon into silly-fix