updated base figures, and pay rise amounts

pension.py

@@ -12,13 +12,13 @@
 ## FINALLY, govt. says I can't get my super until I'm 60
 # but, we have 100k in ME B, 100k in shares, 150k in citi & if redundant, maybe another 100k?  -- thats 4.5 years, call it 3 with the new car, and being not too crazy so, maybe 57... one more 5 year contract
 
-three_ben_sal=195641.27
+three_ben_sal=195999.36
 ben_serv_b4_2015=18.7096
 pension_factor={}
 avg_serv_fraction=0.999901
 avg_cont_factor=1
-five_ben_sal=173450.07
-ben_serv_after_2015=8.8
+five_ben_sal=174156.79
+ben_serv_after_2015=8.8603
 ben_serv_b4_2000=3.71
 avg_serv_frac_at_2003=0.999646
 lump_sum_fac={}
@@ -46,10 +46,10 @@ ben_serv_after_2015 += 3
 # within 2 years, then 5bs will be what my 3bs is now (at least)
 five_ben_sal = three_ben_sal
 
-# we get a 4% increase each year, over the next 3 years, so add them when I confirm
-three_ben_sal *= 1.04
+# we get a 4% increase each year, over the next 2 years?, so add them when I confirm
 three_ben_sal *= 1.04
 three_ben_sal *= 1.04
+#three_ben_sal *= 1.04
 
 # this is a rough-ass guess (its 4% / 5  more each year)
 # need to make this smarter, e.g.