Basic emberjs version
Cleaned stuff up
Merged with githubstuff