Bootstrap edit for gitploy implementation 

Bootstrap edit for gitploy implementation along with some edit to keep things stable and simple