Mike Danese 1065872d29 rebase and resolve a huge amount of conflicts to keep this up to date (does this commit have more LOC changed than the original implementation? that would be funny...)

2015-09-11 17:04:34 -07:00

..

controller_test.go

…

controller.go

…

doc.go

…