Development

Updating master to use new travis.yml and added build badge.