Tidy

Signed-off-by: Simon Bailey <simon@newtriks.com>
Merge remote-tracking branch 'origin/e2e'

Signed-off-by: Simon Bailey <simon@newtriks.com>

Conflicts:
	.DS_Store
Create README.md
Update README.md
Update README.md
Update .travis.yml
Update package.json
Update .travis.yml
Update Gruntfile.js
Updated grunt file

Signed-off-by: Simon Bailey <simon@newtriks.com>
Update Gruntfile.js
Removed unused attrs

Signed-off-by: Simon Bailey <simon@newtriks.com>
Added dummy data to controller test

Signed-off-by: Simon Bailey <simon@newtriks.com>
Merge pull request #2 from newtriks/master

Tidy up and other things as discussed