Added Travis badge
Moved some bootstraping stuff around