replace now() with os:timestamp() in acceptor
Merge pull request #102 from tsloughter/master

replace now() with os:timestamp() in acceptor
normalize whitespace in mochiweb_session
update CHANGES and version for v2.5.0
start crypto before running msession tests
change test matrix to R14B04, R15B*, R16A