added note about force pushing a rebased branch and removed some redundant stuff
Merge pull request #270 from adamralph/various

added note about force pushing a rebased branch and removed some redunda...
#248 version 1.19
Merge pull request #271 from adamralph/248

#248 version 1.19