Added things for today's TODO
editing test for travis
Merge branch 'master' of github.com:arielspear/swap-tacular