Igore eclipse .project file and vim swap files
re-integrated some things.
prefixied state ids.
made apache2 states optional.