Merge branch 'master' into abstract-erd
-rw-r--r-- 844 .gitignore
-rw-r--r-- 8 .rspec
-rw-r--r-- 413 Gemfile
-rw-r--r-- 665 Gemfile.lock
-rw-r--r-- 794 Rakefile
drwxr-xr-x - bundler_stubs
drwxr-xr-x - lib
drwxr-xr-x - spec