Update OAuth login
Merge https://github.com/ycswaves/yamato-meteor

Conflicts:
	.meteor/packages
	smart.json
	smart.lock
Home page changes
Merge https://github.com/ycswaves/yamato-meteor
Add back smart.json
Modify gitignore
Merge https://github.com/ycswaves/yamato-meteor
Merge pull request #3 from daven009/master

Merged