Minor changes.
Merge branch 'master' into cole
Added connections functionality and view.
Merge pull request #39 from areveal/cole

Cole