cleanup to merge with master, updated makefile
updated ember cli 0.1.4