Merge pull request #31 from rocketu/tests

rudy fixed the data and also a test
template updates w travis
Merge pull request #33 from rocketu/template-functions

template updates w travis ojala que
Merge branch 'develop' of https://github.com/rocketu/mission-control into tests
60%, so that's good