Only ignore build in top level
Add some stuff to make building rpms easier
Bump version
Add work around for startup state problem

See https://github.com/saltstack/salt/issues/5670