Merge pull request #1 from isibner/master

Collection fixes
some fixes pre iron-router
changes pre-iron router
started routing