Merge pull request #3 from cam-technologies/master

Updating fork
removing unused code
Removing selft execiting functions from ember code. Removing example tests
updating karma to allow for unit testing of ember, due to route inheradance files need to be listed in order
Improve build script
updating the images path
adding new test runner and intergration test
updating karma to include all application files, adding qunit runner and qunit for development
Merge branch 'master' of https://github.com/chrislaughlin/time-booker
Adding gulp test command for running both tests
Fixing conflicts
fixing merge conflicts
Merge remote-tracking branch 'upstream/master'
updating readme
updating test runner
removing old templates, merging out current templates fixing grunt task
cleaning up index and fixing karam runner to allow pass for now
fixing merge
fixing merge
adding missing changes