finish user controller test and start travis integration
Merge pull request #15 from woolly-bear-caterpillars-2014/john-george

finish user controller test and start travis integration