use Rakefile origin dir to load boot so when using edge with `bundle exec` it searches the correct path
Merge remote-tracking branch 'upstream/master' into super-admin