Merge pull request #15 from daven009/master

Updates
fix router
Merge https://github.com/ycswaves/yamato-meteor

Conflicts:
	client/views/accounts/accounts.js
	client/views/landing/home.js