Merge pull request #12 from mfairchild365/registry

Start adding various registry views
Merge pull request #13 from mfairchild365/registry

Implement the registry
Merge pull request #14 from mfairchild365/registry

Add an edit site form
update vagrant to correctly move phpmyadmin
Merge remote-tracking branch 'upstream/master' into registry